Nothing calls ceph_mdsc_submit_request today, but ceph_mdsc_do_request
just open-codes the same functionality.
Have the helper return an int so we can check the r_err under the mutex,
and have the caller just check the error code from the submit. Also move
the acquisition of CEPH_CAP_PIN references into the same function.
Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
---
fs/ceph/mds_client.c | 40 +++++++++++++++++++---------------------
fs/ceph/mds_client.h | 5 +++--
2 files changed, 22 insertions(+), 23 deletions(-)
diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c
index fde76aa6e916..8d3d56771f09 100644
--- a/fs/ceph/mds_client.c
+++ b/fs/ceph/mds_client.c
@@ -2619,14 +2619,27 @@ static void kick_requests(struct ceph_mds_client *mdsc, int mds)
}
}
-void ceph_mdsc_submit_request(struct ceph_mds_client *mdsc,
+int ceph_mdsc_submit_request(struct ceph_mds_client *mdsc, struct inode *dir,
struct ceph_mds_request *req)
{
- dout("submit_request on %p\n", req);
+ int err;
+
+ /* take CAP_PIN refs for r_inode, r_parent, r_old_dentry */
+ if (req->r_inode)
+ ceph_get_cap_refs(ceph_inode(req->r_inode), CEPH_CAP_PIN);
+ if (req->r_parent)
+ ceph_get_cap_refs(ceph_inode(req->r_parent), CEPH_CAP_PIN);
+ if (req->r_old_dentry_dir)
+ ceph_get_cap_refs(ceph_inode(req->r_old_dentry_dir),
+ CEPH_CAP_PIN);
+
+ dout("submit_request on %p for inode %p\n", req, dir);
mutex_lock(&mdsc->mutex);
- __register_request(mdsc, req, NULL);
+ __register_request(mdsc, req, dir);
__do_request(mdsc, req);
+ err = req->r_err;
mutex_unlock(&mdsc->mutex);
+ return err;
}
/*
@@ -2641,27 +2654,12 @@ int ceph_mdsc_do_request(struct ceph_mds_client *mdsc,
dout("do_request on %p\n", req);
- /* take CAP_PIN refs for r_inode, r_parent, r_old_dentry */
- if (req->r_inode)
- ceph_get_cap_refs(ceph_inode(req->r_inode), CEPH_CAP_PIN);
- if (req->r_parent)
- ceph_get_cap_refs(ceph_inode(req->r_parent), CEPH_CAP_PIN);
- if (req->r_old_dentry_dir)
- ceph_get_cap_refs(ceph_inode(req->r_old_dentry_dir),
- CEPH_CAP_PIN);
-
/* issue */
- mutex_lock(&mdsc->mutex);
- __register_request(mdsc, req, dir);
- __do_request(mdsc, req);
-
- if (req->r_err) {
- err = req->r_err;
+ err = ceph_mdsc_submit_request(mdsc, dir, req);
+ if (err)
goto out;
- }
/* wait */
- mutex_unlock(&mdsc->mutex);
dout("do_request waiting\n");
if (!req->r_timeout && req->r_wait_for_completion) {
err = req->r_wait_for_completion(mdsc, req);
@@ -2702,8 +2700,8 @@ int ceph_mdsc_do_request(struct ceph_mds_client *mdsc,
err = req->r_err;
}
-out:
mutex_unlock(&mdsc->mutex);
+out:
dout("do_request %p done, result %d\n", req, err);
return err;
}
diff --git a/fs/ceph/mds_client.h b/fs/ceph/mds_client.h
index 3f0029aa8a39..98ff39fbf94a 100644
--- a/fs/ceph/mds_client.h
+++ b/fs/ceph/mds_client.h
@@ -465,8 +465,9 @@ extern int ceph_alloc_readdir_reply_buffer(struct ceph_mds_request *req,
struct inode *dir);
extern struct ceph_mds_request *
ceph_mdsc_create_request(struct ceph_mds_client *mdsc, int op, int mode);
-extern void ceph_mdsc_submit_request(struct ceph_mds_client *mdsc,
- struct ceph_mds_request *req);
+extern int ceph_mdsc_submit_request(struct ceph_mds_client *mdsc,
+ struct inode *dir,
+ struct ceph_mds_request *req);
extern int ceph_mdsc_do_request(struct ceph_mds_client *mdsc,
struct inode *dir,
struct ceph_mds_request *req);
--
2.20.1
