diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-09-29 16:46:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-09-29 16:46:24 -0700 |
| commit | 14c06b913d4a11b50351ef5bcb3f112247f647f3 (patch) | |
| tree | c81b4871ff5c0a9a357fb68c304314b7a83bd7b3 /fs | |
| parent | 10c0b6ba25a71d14f80586f6a795dbc47f5c6731 (diff) | |
| parent | 0b207d02bd9ab8dcc31b262ca9f60dbc1822500d (diff) | |
Merge tag 'ceph-for-6.6-rc4' of https://github.com/ceph/ceph-client
Pull ceph fixes from Ilya Dryomov:
"A series that fixes an involved 'double watch error' deadlock in RBD
marked for stable and two cleanups"
* tag 'ceph-for-6.6-rc4' of https://github.com/ceph/ceph-client:
rbd: take header_rwsem in rbd_dev_refresh() only when updating
rbd: decouple parent info read-in from updating rbd_dev
rbd: decouple header read-in from updating rbd_dev->header
rbd: move rbd_dev_refresh() definition
Revert "ceph: make members in struct ceph_mds_request_args_ext a union"
ceph: remove unnecessary check for NULL in parse_longname()
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ceph/crypto.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/ceph/crypto.c b/fs/ceph/crypto.c index e4d5cd56a80b..e1f31b86fd48 100644 --- a/fs/ceph/crypto.c +++ b/fs/ceph/crypto.c @@ -249,11 +249,9 @@ static struct inode *parse_longname(const struct inode *parent, if (!dir) { /* This can happen if we're not mounting cephfs on the root */ dir = ceph_get_inode(parent->i_sb, vino, NULL); - if (!dir) - dir = ERR_PTR(-ENOENT); + if (IS_ERR(dir)) + dout("Can't find inode %s (%s)\n", inode_number, name); } - if (IS_ERR(dir)) - dout("Can't find inode %s (%s)\n", inode_number, name); out: kfree(inode_number); |