summaryrefslogtreecommitdiff
path: root/fs/ceph
diff options
context:
space:
mode:
authorQiujun Huang <hqjagain@gmail.com>2020-03-06 09:34:20 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-04-29 16:31:10 +0200
commita7eba547137b9e699cea0d363ec2e31c5ef5f281 (patch)
tree55014ed86929ae8cc686342eace7bd8929cf5c8f /fs/ceph
parentb77e19da5647ebec0e3306cb47942ede0cfd079c (diff)
ceph: return ceph_mdsc_do_request() errors from __get_parent()
[ Upstream commit c6d50296032f0b97473eb2e274dc7cc5d0173847 ] Return the error returned by ceph_mdsc_do_request(). Otherwise, r_target_inode ends up being NULL this ends up returning ENOENT regardless of the error. Signed-off-by: Qiujun Huang <hqjagain@gmail.com> Reviewed-by: Jeff Layton <jlayton@kernel.org> Signed-off-by: Ilya Dryomov <idryomov@gmail.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'fs/ceph')
-rw-r--r--fs/ceph/export.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/ceph/export.c b/fs/ceph/export.c
index 3c59ad180ef0..4cfe1154d4c7 100644
--- a/fs/ceph/export.c
+++ b/fs/ceph/export.c
@@ -151,6 +151,11 @@ static struct dentry *__get_parent(struct super_block *sb,
req->r_num_caps = 1;
err = ceph_mdsc_do_request(mdsc, NULL, req);
+ if (err) {
+ ceph_mdsc_put_request(req);
+ return ERR_PTR(err);
+ }
+
inode = req->r_target_inode;
if (inode)
ihold(inode);