Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3167893a authored by Chengguang Xu's avatar Chengguang Xu Committed by Ilya Dryomov
Browse files

ceph: reset cap hold timeout only for requeued inode 



__cap_delay_requeue() only requeue inode which does not
have CEPH_I_FLUSH flag, so avoid reset cap hold timeout
for that inode.

Signed-off-by: default avatarChengguang Xu <cgxu519@gmx.com>
Reviewed-by: default avatar"Yan, Zheng" <zyan@redhat.com>
Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
parent 84df9525

fs/ceph/caps.c

+1 −1
Original line number Diff line number Diff line
@@ -521,7 +521,6 @@ static void __cap_set_timeouts(struct ceph_mds_client *mdsc, 
static void __cap_delay_requeue(struct ceph_mds_client *mdsc,

				struct ceph_inode_info *ci)

{

	__cap_set_timeouts(mdsc, ci);

	dout("__cap_delay_requeue %p flags %d at %lu\n", &ci->vfs_inode,

	     ci->i_ceph_flags, ci->i_hold_caps_max);

	if (!mdsc->stopping) {
@@ -531,6 +530,7 @@ static void __cap_delay_requeue(struct ceph_mds_client *mdsc, 
				goto no_change;

			list_del_init(&ci->i_cap_delay_list);

		}

		__cap_set_timeouts(mdsc, ci);

		list_add_tail(&ci->i_cap_delay_list, &mdsc->cap_delay_list);

no_change:

		spin_unlock(&mdsc->cap_delay_lock);