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

ceph: switch to global cap helper 



__ceph_is_any_caps is a duplicate helper.

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 bba1560b

fs/ceph/caps.c

+10 −14
Original line number Diff line number Diff line
@@ -1011,18 +1011,13 @@ static int __ceph_is_single_caps(struct ceph_inode_info *ci) 
	return rb_first(&ci->i_caps) == rb_last(&ci->i_caps);

}



static int __ceph_is_any_caps(struct ceph_inode_info *ci)

{

	return !RB_EMPTY_ROOT(&ci->i_caps);

}



int ceph_is_any_caps(struct inode *inode)

{

	struct ceph_inode_info *ci = ceph_inode(inode);

	int ret;



	spin_lock(&ci->i_ceph_lock);

	ret = __ceph_is_any_caps(ci);

	ret = __ceph_is_any_real_caps(ci);

	spin_unlock(&ci->i_ceph_lock);



	return ret;
@@ -1099,16 +1094,17 @@ void __ceph_remove_cap(struct ceph_cap *cap, bool queue_release) 
	if (removed)

		ceph_put_cap(mdsc, cap);



	if (!__ceph_is_any_real_caps(ci)) {

		/* when reconnect denied, we remove session caps forcibly,

		 * i_wr_ref can be non-zero. If there are ongoing write,

		 * keep i_snap_realm.

		 */

	if (!__ceph_is_any_caps(ci) && ci->i_wr_ref == 0 && ci->i_snap_realm)

		if (ci->i_wr_ref == 0 && ci->i_snap_realm)

			drop_inode_snap_realm(ci);



	if (!__ceph_is_any_real_caps(ci))

		__cap_delay_cancel(mdsc, ci);

	}

}



struct cap_msg_args {

	struct ceph_mds_session	*session;
@@ -2945,7 +2941,7 @@ void ceph_put_cap_refs(struct ceph_inode_info *ci, int had) 
				ci->i_head_snapc = NULL;

			}

			/* see comment in __ceph_remove_cap() */

			if (!__ceph_is_any_caps(ci) && ci->i_snap_realm)

			if (!__ceph_is_any_real_caps(ci) && ci->i_snap_realm)

				drop_inode_snap_realm(ci);

		}

	spin_unlock(&ci->i_ceph_lock);