Commit ffb61c55 authored Apr 08, 2019 by Jeff Layton Committed by Ilya Dryomov May 07, 2019

ceph: remove superfluous inode_lock in ceph_fsync



Originally, filemap_write_and_wait took the i_mutex internally, but
commit 02c24a82 pushed the mutex acquisition into the individual
fsync routines, leaving it up to the subsystem maintainers to remove
it if it wasn't needed.

For ceph, I see no reason to take the inode_lock here. All of the
operations inside that lock are protected by their own locking.

Signed-off-by: Jeff Layton <jlayton@kernel.org>
Reviewed-by: "Yan, Zheng" <zyan@redhat.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>

parent 0384892c

fs/ceph/caps.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -2257,8 +2257,6 @@ int ceph_fsync(struct file *file, loff_t start, loff_t end, int datasync)
		if (datasync)
		goto out;

		inode_lock(inode);

		dirty = try_flush_caps(inode, &flush_tid);
		dout("fsync dirty caps are %s\n", ceph_cap_string(dirty));

		@@ -2273,7 +2271,6 @@ int ceph_fsync(struct file *file, loff_t start, loff_t end, int datasync)
		ret = wait_event_interruptible(ci->i_cap_wq,
		caps_are_flushed(inode, flush_tid));
		}
		inode_unlock(inode);
		out:
		dout("fsync %p%s result=%d\n", inode, datasync ? " datasync" : "", ret);
		return ret;