ceph: remove ceph_get_cap_mds and __ceph_get_cap_mds (5de16b30) · Commits · 戴 / test

fs/ceph/caps.c

+0 −31

Original line number	Diff line number	Diff line
		@@ -457,37 +457,6 @@ struct ceph_cap ceph_get_cap_for_mds(struct ceph_inode_info ci, int mds)
		return cap;
		}

		/*
		* Return id of any MDS with a cap, preferably FILE_WR\|BUFFER\|EXCL, else -1.
		*/
		static int __ceph_get_cap_mds(struct ceph_inode_info *ci)
		{
		struct ceph_cap *cap;
		int mds = -1;
		struct rb_node *p;

		/* prefer mds with WR\|BUFFER\|EXCL caps */
		for (p = rb_first(&ci->i_caps); p; p = rb_next(p)) {
		cap = rb_entry(p, struct ceph_cap, ci_node);
		mds = cap->mds;
		if (cap->issued & (CEPH_CAP_FILE_WR \|
		CEPH_CAP_FILE_BUFFER \|
		CEPH_CAP_FILE_EXCL))
		break;
		}
		return mds;
		}

		int ceph_get_cap_mds(struct inode *inode)
		{
		struct ceph_inode_info *ci = ceph_inode(inode);
		int mds;
		spin_lock(&ci->i_ceph_lock);
		mds = __ceph_get_cap_mds(ceph_inode(inode));
		spin_unlock(&ci->i_ceph_lock);
		return mds;
		}

		/*
		* Called under i_ceph_lock.
		*/

+0 −1

Original line number	Diff line number	Diff line
		@@ -1052,7 +1052,6 @@ extern void ceph_kick_flushing_caps(struct ceph_mds_client *mdsc,
		struct ceph_mds_session *session);
		extern struct ceph_cap ceph_get_cap_for_mds(struct ceph_inode_info ci,
		int mds);
		extern int ceph_get_cap_mds(struct inode *inode);
		extern void ceph_get_cap_refs(struct ceph_inode_info *ci, int caps);
		extern void ceph_put_cap_refs(struct ceph_inode_info *ci, int had);
		extern void ceph_put_wrbuffer_cap_refs(struct ceph_inode_info *ci, int nr,