diff options
| author | Dan Carpenter <error27@gmail.com> | 2010-04-21 12:31:13 +0200 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2010-05-17 15:25:22 -0700 |
| commit | 0d509c949a4d3f21943bd93863a2e6c2f0d0c004 (patch) | |
| tree | ecc5e040ddc8f61f39062c4694b4484adf19c9ae /fs | |
| parent | c473ad927e6b3be0bac51ddf312e5d8d2b9220b0 (diff) | |
| download | op-kernel-dev-0d509c949a4d3f21943bd93863a2e6c2f0d0c004.zip op-kernel-dev-0d509c949a4d3f21943bd93863a2e6c2f0d0c004.tar.gz | |
ceph: d_obtain_alias() returns ERR_PTR()
d_obtain_alias() doesn't return NULL, it returns an ERR_PTR().
Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ceph/export.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/ceph/export.c b/fs/ceph/export.c index 1568390..1744764 100644 --- a/fs/ceph/export.c +++ b/fs/ceph/export.c @@ -93,11 +93,11 @@ static struct dentry *__fh_to_dentry(struct super_block *sb, return ERR_PTR(-ESTALE); dentry = d_obtain_alias(inode); - if (!dentry) { + if (IS_ERR(dentry)) { pr_err("fh_to_dentry %llx -- inode %p but ENOMEM\n", fh->ino, inode); iput(inode); - return ERR_PTR(-ENOMEM); + return dentry; } err = ceph_init_dentry(dentry); @@ -149,11 +149,11 @@ static struct dentry *__cfh_to_dentry(struct super_block *sb, } dentry = d_obtain_alias(inode); - if (!dentry) { + if (IS_ERR(dentry)) { pr_err("cfh_to_dentry %llx -- inode %p but ENOMEM\n", cfh->ino, inode); iput(inode); - return ERR_PTR(-ENOMEM); + return dentry; } err = ceph_init_dentry(dentry); if (err < 0) { @@ -202,11 +202,11 @@ static struct dentry *ceph_fh_to_parent(struct super_block *sb, return ERR_PTR(-ESTALE); dentry = d_obtain_alias(inode); - if (!dentry) { + if (IS_ERR(dentry)) { pr_err("fh_to_parent %llx -- inode %p but ENOMEM\n", cfh->ino, inode); iput(inode); - return ERR_PTR(-ENOMEM); + return dentry; } err = ceph_init_dentry(dentry); if (err < 0) { |
