redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

ceph: fix d_obtain_alias() misuses 

on failure d_obtain_alias() will have done iput()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
steinar/wifi_calib_4_9_kernel
Al Viro 2016-06-24 23:49:03 -04:00
parent ebaaa80e8f
commit b42b90d177
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fs/ceph/export.c
View File

@ -95,10 +95,8 @@ static struct dentry *__fh_to_dentry(struct super_block *sb, u64 ino)
}
dentry = d_obtain_alias(inode);
if (IS_ERR(dentry)) {
iput(inode);
if (IS_ERR(dentry))
return dentry;
}
err = ceph_init_dentry(dentry);
if (err < 0) {
dput(dentry);
@ -167,10 +165,8 @@ static struct dentry *__get_parent(struct super_block *sb,
return ERR_PTR(-ENOENT);
dentry = d_obtain_alias(inode);
if (IS_ERR(dentry)) {
iput(inode);
if (IS_ERR(dentry))
return dentry;
}
err = ceph_init_dentry(dentry);
if (err < 0) {
dput(dentry);
@ -210,7 +206,7 @@ static struct dentry *ceph_fh_to_parent(struct super_block *sb,
dout("fh_to_parent %llx\n", cfh->parent_ino);
dentry = __get_parent(sb, NULL, cfh->ino);
if (IS_ERR(dentry) && PTR_ERR(dentry) == -ENOENT)
if (unlikely(dentry == ERR_PTR(-ENOENT)))
dentry = __fh_to_dentry(sb, cfh->parent_ino);
return dentry;
}