Commit 0d509c94 authored by Dan Carpenter's avatar Dan Carpenter Committed by Sage Weil

ceph: d_obtain_alias() returns ERR_PTR()

d_obtain_alias() doesn't return NULL, it returns an ERR_PTR().
Signed-off-by: default avatarDan Carpenter <error27@gmail.com>
Signed-off-by: default avatarSage Weil <sage@newdream.net>
parent c473ad92
...@@ -93,11 +93,11 @@ static struct dentry *__fh_to_dentry(struct super_block *sb, ...@@ -93,11 +93,11 @@ static struct dentry *__fh_to_dentry(struct super_block *sb,
return ERR_PTR(-ESTALE); return ERR_PTR(-ESTALE);
dentry = d_obtain_alias(inode); dentry = d_obtain_alias(inode);
if (!dentry) { if (IS_ERR(dentry)) {
pr_err("fh_to_dentry %llx -- inode %p but ENOMEM\n", pr_err("fh_to_dentry %llx -- inode %p but ENOMEM\n",
fh->ino, inode); fh->ino, inode);
iput(inode); iput(inode);
return ERR_PTR(-ENOMEM); return dentry;
} }
err = ceph_init_dentry(dentry); err = ceph_init_dentry(dentry);
...@@ -149,11 +149,11 @@ static struct dentry *__cfh_to_dentry(struct super_block *sb, ...@@ -149,11 +149,11 @@ static struct dentry *__cfh_to_dentry(struct super_block *sb,
} }
dentry = d_obtain_alias(inode); dentry = d_obtain_alias(inode);
if (!dentry) { if (IS_ERR(dentry)) {
pr_err("cfh_to_dentry %llx -- inode %p but ENOMEM\n", pr_err("cfh_to_dentry %llx -- inode %p but ENOMEM\n",
cfh->ino, inode); cfh->ino, inode);
iput(inode); iput(inode);
return ERR_PTR(-ENOMEM); return dentry;
} }
err = ceph_init_dentry(dentry); err = ceph_init_dentry(dentry);
if (err < 0) { if (err < 0) {
...@@ -202,11 +202,11 @@ static struct dentry *ceph_fh_to_parent(struct super_block *sb, ...@@ -202,11 +202,11 @@ static struct dentry *ceph_fh_to_parent(struct super_block *sb,
return ERR_PTR(-ESTALE); return ERR_PTR(-ESTALE);
dentry = d_obtain_alias(inode); dentry = d_obtain_alias(inode);
if (!dentry) { if (IS_ERR(dentry)) {
pr_err("fh_to_parent %llx -- inode %p but ENOMEM\n", pr_err("fh_to_parent %llx -- inode %p but ENOMEM\n",
cfh->ino, inode); cfh->ino, inode);
iput(inode); iput(inode);
return ERR_PTR(-ENOMEM); return dentry;
} }
err = ceph_init_dentry(dentry); err = ceph_init_dentry(dentry);
if (err < 0) { if (err < 0) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment