ceph: remove duplicated filelock ref increase (1b52931c) · Commits · 戴 / test

Inode i_filelock_ref is increased in ceph_lock or ceph_flock, but it is increased again in ceph_lock_message. This results in this ref won't become zero. If CEPH_I_ERROR_FILELOCK flag is set in remove_session_caps once, this flag can't be cleared even if client is back to normal. So further file lock will return EIO. Signed-off-by:

Zhi Zhang <zhang.david2011@gmail.com> Reviewed-by:

"Yan, Zheng" <zyan@redhat.com> Signed-off-by:

Ilya Dryomov <idryomov@gmail.com>

fs/ceph/locks.c

+0 −13

Original line number	Diff line number	Diff line
		@@ -237,15 +237,6 @@ int ceph_lock(struct file file, int cmd, struct file_lock fl)
		spin_lock(&ci->i_ceph_lock);
		if (ci->i_ceph_flags & CEPH_I_ERROR_FILELOCK) {
		err = -EIO;
		} else if (op == CEPH_MDS_OP_SETFILELOCK) {
		/*
		* increasing i_filelock_ref closes race window between
		* handling request reply and adding file_lock struct to
		* inode. Otherwise, i_auth_cap may get trimmed in the
		* window. Caller function will decrease the counter.
		*/
		fl->fl_ops = &ceph_fl_lock_ops;
		atomic_inc(&ci->i_filelock_ref);
		}
		spin_unlock(&ci->i_ceph_lock);
		if (err < 0) {
		@@ -299,10 +290,6 @@ int ceph_flock(struct file file, int cmd, struct file_lock fl)
		spin_lock(&ci->i_ceph_lock);
		if (ci->i_ceph_flags & CEPH_I_ERROR_FILELOCK) {
		err = -EIO;
		} else {
		/* see comment in ceph_lock */
		fl->fl_ops = &ceph_fl_lock_ops;
		atomic_inc(&ci->i_filelock_ref);
		}
		spin_unlock(&ci->i_ceph_lock);
		if (err < 0) {

Admin message