Skip to content

Commit

Permalink
ceph: fix d_obtain_alias() misuses
Browse files Browse the repository at this point in the history 
on failure d_obtain_alias() will have done iput()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  • Loading branch information
Al Viro committed Jun 25, 2016
1 parent ebaaa80 commit b42b90d
Showing 1 changed file with 3 additions and 7 deletions.
10 changes: 3 additions & 7 deletions fs/ceph/export.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit b42b90d

Please sign in to comment.