diff options
| author |   Yan, Zheng <zyan@redhat.com> | 2018-09-28 11:34:42 +0800 |
|---|---|---|
| committer |   Ilya Dryomov <idryomov@gmail.com> | 2018-10-22 10:28:20 +0200 |
| commit | 74c9e6bf4c888e41bc7db340fb94fade96394038 (patch) | |
| tree | 58d2a3682902f7d7aa991ef99d741a1d4b1f4e75 /fs/ceph | |
| parent | ceph: fix dentry leak in ceph_readdir_prepopulate (diff) | |
| download | linux-dev-74c9e6bf4c888e41bc7db340fb94fade96394038.tar.xz linux-dev-74c9e6bf4c888e41bc7db340fb94fade96394038.zip | |
ceph: check if LOOKUPNAME request was aborted when filling trace
d_lookup()/d_alloc() require parent inode locked. Parent inode is
not locked if request is aborted.
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Diffstat (limited to 'fs/ceph')
| -rw-r--r-- | fs/ceph/inode.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c index 46254d53392f..79dd5e6ed755 100644 --- a/fs/ceph/inode.c +++ b/fs/ceph/inode.c @@ -1200,7 +1200,9 @@ int ceph_fill_trace(struct super_block *sb, struct ceph_mds_request *req) WARN_ON_ONCE(1); } - if (dir && req->r_op == CEPH_MDS_OP_LOOKUPNAME) { + if (dir && req->r_op == CEPH_MDS_OP_LOOKUPNAME && + test_bit(CEPH_MDS_R_PARENT_LOCKED, &req->r_req_flags) && + !test_bit(CEPH_MDS_R_ABORTED, &req->r_req_flags)) { struct qstr dname; struct dentry *dn, *parent; |