Commit ae067063 authored by Xiubo Li's avatar Xiubo Li Committed by Ilya Dryomov
Browse files

ceph: rename unsafe_request_wait() 



Rename it to flush_mdlog_and_wait_inode_unsafe_requests() to make
it more descriptive.

Signed-off-by: default avatarXiubo Li <xiubli@redhat.com>
Reviewed-by: default avatarJeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
parent d9d58f04

fs/ceph/caps.c

+4 −4
Original line number Diff line number Diff line
@@ -2219,9 +2219,9 @@ static int caps_are_flushed(struct inode *inode, u64 flush_tid) 
}



/*

 * wait for any unsafe requests to complete.

 * flush the mdlog and wait for any unsafe requests to complete.

 */

static int unsafe_request_wait(struct inode *inode)

static int flush_mdlog_and_wait_inode_unsafe_requests(struct inode *inode)

{

	struct ceph_mds_client *mdsc = ceph_sb_to_client(inode->i_sb)->mdsc;

	struct ceph_inode_info *ci = ceph_inode(inode);
@@ -2337,7 +2337,7 @@ static int unsafe_request_wait(struct inode *inode) 
		kfree(sessions);

	}



	dout("unsafe_request_wait %p wait on tid %llu %llu\n",

	dout("%s %p wait on tid %llu %llu\n", __func__,

	     inode, req1 ? req1->r_tid : 0ULL, req2 ? req2->r_tid : 0ULL);

	if (req1) {

		ret = !wait_for_completion_timeout(&req1->r_safe_completion,
@@ -2381,7 +2381,7 @@ int ceph_fsync(struct file *file, loff_t start, loff_t end, int datasync) 
	dirty = try_flush_caps(inode, &flush_tid);

	dout("fsync dirty caps are %s\n", ceph_cap_string(dirty));



	err = unsafe_request_wait(inode);

	err = flush_mdlog_and_wait_inode_unsafe_requests(inode);



	/*

	 * only wait on non-file metadata writeback (the mds