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

ceph: pass the mdsc to several helpers 

We will use the 'mdsc' to get the global_id in the following commits.

Link: https://tracker.ceph.com/issues/61590


Signed-off-by: default avatarXiubo Li <xiubli@redhat.com>
Reviewed-by: default avatarPatrick Donnelly <pdonnell@redhat.com>
Reviewed-by: default avatarMilind Changire <mchangir@redhat.com>
Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
parent 5c5f0d2b

fs/ceph/caps.c

+9 −6
Original line number Diff line number Diff line
@@ -1178,7 +1178,8 @@ void __ceph_remove_cap(struct ceph_cap *cap, bool queue_release) 
	}

}



void ceph_remove_cap(struct ceph_cap *cap, bool queue_release)

void ceph_remove_cap(struct ceph_mds_client *mdsc, struct ceph_cap *cap,

		     bool queue_release)

{

	struct ceph_inode_info *ci = cap->ci;

	struct ceph_fs_client *fsc;
@@ -1342,6 +1343,8 @@ static void encode_cap_msg(struct ceph_msg *msg, struct cap_msg_args *arg) 
 */

void __ceph_remove_caps(struct ceph_inode_info *ci)

{

	struct inode *inode = &ci->netfs.inode;

	struct ceph_mds_client *mdsc = ceph_inode_to_client(inode)->mdsc;

	struct rb_node *p;



	/* lock i_ceph_lock, because ceph_d_revalidate(..., LOOKUP_RCU)
@@ -1351,7 +1354,7 @@ void __ceph_remove_caps(struct ceph_inode_info *ci) 
	while (p) {

		struct ceph_cap *cap = rb_entry(p, struct ceph_cap, ci_node);

		p = rb_next(p);

		ceph_remove_cap(cap, true);

		ceph_remove_cap(mdsc, cap, true);

	}

	spin_unlock(&ci->i_ceph_lock);

}
@@ -3999,7 +4002,7 @@ static void handle_cap_export(struct inode *inode, struct ceph_mds_caps *ex, 
		goto out_unlock;



	if (target < 0) {

		ceph_remove_cap(cap, false);

		ceph_remove_cap(mdsc, cap, false);

		goto out_unlock;

	}
@@ -4034,7 +4037,7 @@ static void handle_cap_export(struct inode *inode, struct ceph_mds_caps *ex, 
				change_auth_cap_ses(ci, tcap->session);

			}

		}

		ceph_remove_cap(cap, false);

		ceph_remove_cap(mdsc, cap, false);

		goto out_unlock;

	} else if (tsession) {

		/* add placeholder for the export tagert */
@@ -4051,7 +4054,7 @@ static void handle_cap_export(struct inode *inode, struct ceph_mds_caps *ex, 
			spin_unlock(&mdsc->cap_dirty_lock);

		}



		ceph_remove_cap(cap, false);

		ceph_remove_cap(mdsc, cap, false);

		goto out_unlock;

	}
@@ -4164,7 +4167,7 @@ static void handle_cap_import(struct ceph_mds_client *mdsc, 
					ocap->mseq, mds, le32_to_cpu(ph->seq),

					le32_to_cpu(ph->mseq));

		}

		ceph_remove_cap(ocap, (ph->flags & CEPH_CAP_FLAG_RELEASE));

		ceph_remove_cap(mdsc, ocap, (ph->flags & CEPH_CAP_FLAG_RELEASE));

	}



	*old_issued = issued;

fs/ceph/debugfs.c

+2 −2
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ static int mdsc_show(struct seq_file *s, void *p) 
		if (req->r_inode) {

			seq_printf(s, " #%llx", ceph_ino(req->r_inode));

		} else if (req->r_dentry) {

			path = ceph_mdsc_build_path(req->r_dentry, &pathlen,

			path = ceph_mdsc_build_path(mdsc, req->r_dentry, &pathlen,

						    &pathbase, 0);

			if (IS_ERR(path))

				path = NULL;
@@ -100,7 +100,7 @@ static int mdsc_show(struct seq_file *s, void *p) 
		}



		if (req->r_old_dentry) {

			path = ceph_mdsc_build_path(req->r_old_dentry, &pathlen,

			path = ceph_mdsc_build_path(mdsc, req->r_old_dentry, &pathlen,

						    &pathbase, 0);

			if (IS_ERR(path))

				path = NULL;

fs/ceph/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -1226,7 +1226,7 @@ static void ceph_async_unlink_cb(struct ceph_mds_client *mdsc, 
	if (result) {

		int pathlen = 0;

		u64 base = 0;

		char *path = ceph_mdsc_build_path(dentry, &pathlen,

		char *path = ceph_mdsc_build_path(mdsc, dentry, &pathlen,

						  &base, 0);



		/* mark error on parent + clear complete */

fs/ceph/file.c

+1 −1
Original line number Diff line number Diff line
@@ -574,7 +574,7 @@ static void ceph_async_create_cb(struct ceph_mds_client *mdsc, 
	if (result) {

		int pathlen = 0;

		u64 base = 0;

		char *path = ceph_mdsc_build_path(req->r_dentry, &pathlen,

		char *path = ceph_mdsc_build_path(mdsc, req->r_dentry, &pathlen,

						  &base, 0);



		pr_warn("async create failure path=(%llx)%s result=%d!\n",

fs/ceph/mds_client.c

+22 −17
Original line number Diff line number Diff line
@@ -2126,6 +2126,7 @@ static bool drop_negative_children(struct dentry *dentry) 
 */

static int trim_caps_cb(struct inode *inode, int mds, void *arg)

{

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

	int *remaining = arg;

	struct ceph_inode_info *ci = ceph_inode(inode);

	int used, wanted, oissued, mine;
@@ -2173,7 +2174,7 @@ static int trim_caps_cb(struct inode *inode, int mds, void *arg) 


	if (oissued) {

		/* we aren't the only cap.. just remove us */

		ceph_remove_cap(cap, true);

		ceph_remove_cap(mdsc, cap, true);

		(*remaining)--;

	} else {

		struct dentry *dentry;
@@ -2588,6 +2589,7 @@ static u8 *get_fscrypt_altname(const struct ceph_mds_request *req, u32 *plen) 


/**

 * ceph_mdsc_build_path - build a path string to a given dentry

 * @mdsc: mds client

 * @dentry: dentry to which path should be built

 * @plen: returned length of string

 * @pbase: returned base inode number
@@ -2607,8 +2609,8 @@ static u8 *get_fscrypt_altname(const struct ceph_mds_request *req, u32 *plen) 
 * Encode hidden .snap dirs as a double /, i.e.

 *   foo/.snap/bar -> foo//bar

 */

char *ceph_mdsc_build_path(struct dentry *dentry, int *plen, u64 *pbase,

			   int for_wire)

char *ceph_mdsc_build_path(struct ceph_mds_client *mdsc, struct dentry *dentry,

			   int *plen, u64 *pbase, int for_wire)

{

	struct dentry *cur;

	struct inode *inode;
@@ -2726,9 +2728,9 @@ char *ceph_mdsc_build_path(struct dentry *dentry, int *plen, u64 *pbase, 
	return path + pos;

}



static int build_dentry_path(struct dentry *dentry, struct inode *dir,

			     const char **ppath, int *ppathlen, u64 *pino,

			     bool *pfreepath, bool parent_locked)

static int build_dentry_path(struct ceph_mds_client *mdsc, struct dentry *dentry,

			     struct inode *dir, const char **ppath, int *ppathlen,

			     u64 *pino, bool *pfreepath, bool parent_locked)

{

	char *path;
@@ -2744,7 +2746,7 @@ static int build_dentry_path(struct dentry *dentry, struct inode *dir, 
		return 0;

	}

	rcu_read_unlock();

	path = ceph_mdsc_build_path(dentry, ppathlen, pino, 1);

	path = ceph_mdsc_build_path(mdsc, dentry, ppathlen, pino, 1);

	if (IS_ERR(path))

		return PTR_ERR(path);

	*ppath = path;
@@ -2756,6 +2758,7 @@ static int build_inode_path(struct inode *inode, 
			    const char **ppath, int *ppathlen, u64 *pino,

			    bool *pfreepath)

{

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

	struct dentry *dentry;

	char *path;
@@ -2765,7 +2768,7 @@ static int build_inode_path(struct inode *inode, 
		return 0;

	}

	dentry = d_find_alias(inode);

	path = ceph_mdsc_build_path(dentry, ppathlen, pino, 1);

	path = ceph_mdsc_build_path(mdsc, dentry, ppathlen, pino, 1);

	dput(dentry);

	if (IS_ERR(path))

		return PTR_ERR(path);
@@ -2778,10 +2781,11 @@ static int build_inode_path(struct inode *inode, 
 * request arguments may be specified via an inode *, a dentry *, or

 * an explicit ino+path.

 */

static int set_request_path_attr(struct inode *rinode, struct dentry *rdentry,

				  struct inode *rdiri, const char *rpath,

				  u64 rino, const char **ppath, int *pathlen,

				  u64 *ino, bool *freepath, bool parent_locked)

static int set_request_path_attr(struct ceph_mds_client *mdsc, struct inode *rinode,

				 struct dentry *rdentry, struct inode *rdiri,

				 const char *rpath, u64 rino, const char **ppath,

				 int *pathlen, u64 *ino, bool *freepath,

				 bool parent_locked)

{

	int r = 0;
@@ -2790,7 +2794,7 @@ static int set_request_path_attr(struct inode *rinode, struct dentry *rdentry, 
		dout(" inode %p %llx.%llx\n", rinode, ceph_ino(rinode),

		     ceph_snap(rinode));

	} else if (rdentry) {

		r = build_dentry_path(rdentry, rdiri, ppath, pathlen, ino,

		r = build_dentry_path(mdsc, rdentry, rdiri, ppath, pathlen, ino,

					freepath, parent_locked);

		dout(" dentry %p %llx/%.*s\n", rdentry, *ino, *pathlen,

		     *ppath);
@@ -2877,7 +2881,7 @@ static struct ceph_msg *create_request_message(struct ceph_mds_session *session, 
	bool old_version = !test_bit(CEPHFS_FEATURE_32BITS_RETRY_FWD,

				     &session->s_features);



	ret = set_request_path_attr(req->r_inode, req->r_dentry,

	ret = set_request_path_attr(mdsc, req->r_inode, req->r_dentry,

			      req->r_parent, req->r_path1, req->r_ino1.ino,

			      &path1, &pathlen1, &ino1, &freepath1,

			      test_bit(CEPH_MDS_R_PARENT_LOCKED,
@@ -2891,7 +2895,7 @@ static struct ceph_msg *create_request_message(struct ceph_mds_session *session, 
	if (req->r_old_dentry &&

	    !(req->r_old_dentry->d_flags & DCACHE_DISCONNECTED))

		old_dentry = req->r_old_dentry;

	ret = set_request_path_attr(NULL, old_dentry,

	ret = set_request_path_attr(mdsc, NULL, old_dentry,

			      req->r_old_dentry_dir,

			      req->r_path2, req->r_ino2.ino,

			      &path2, &pathlen2, &ino2, &freepath2, true);
@@ -4290,6 +4294,7 @@ static struct dentry* d_find_primary(struct inode *inode) 
 */

static int reconnect_caps_cb(struct inode *inode, int mds, void *arg)

{

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

	union {

		struct ceph_mds_cap_reconnect v2;

		struct ceph_mds_cap_reconnect_v1 v1;
@@ -4307,7 +4312,7 @@ static int reconnect_caps_cb(struct inode *inode, int mds, void *arg) 
	dentry = d_find_primary(inode);

	if (dentry) {

		/* set pathbase to parent dir when msg_version >= 2 */

		path = ceph_mdsc_build_path(dentry, &pathlen, &pathbase,

		path = ceph_mdsc_build_path(mdsc, dentry, &pathlen, &pathbase,

					    recon_state->msg_version >= 2);

		dput(dentry);

		if (IS_ERR(path)) {
@@ -5662,7 +5667,7 @@ void ceph_mdsc_handle_mdsmap(struct ceph_mds_client *mdsc, struct ceph_msg *msg) 
		return;

	}



	newmap = ceph_mdsmap_decode(&p, end, ceph_msgr2(mdsc->fsc->client));

	newmap = ceph_mdsmap_decode(mdsc, &p, end, ceph_msgr2(mdsc->fsc->client));

	if (IS_ERR(newmap)) {

		err = PTR_ERR(newmap);

		goto bad_unlock;