summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorDan Carpenter <error27@gmail.com>2010-08-25 09:11:35 +0200
committerSage Weil <sage@newdream.net>2010-08-25 12:01:54 -0700
commitac1f12ef569d49b013c3db86e11be7e15d66b1c3 (patch)
tree79ca92f4f4c08a14629ff6b2b3b74d2eb7fac5eb /fs
parent36e21687e6e51c4225c42e6291938363f7bbfa7c (diff)
downloadop-kernel-dev-ac1f12ef569d49b013c3db86e11be7e15d66b1c3.zip
op-kernel-dev-ac1f12ef569d49b013c3db86e11be7e15d66b1c3.tar.gz
ceph: ceph_get_inode() returns an ERR_PTR
ceph_get_inode() returns an ERR_PTR and it doesn't return a NULL. 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/inode.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c
index 3e6b52c..e7cca414 100644
--- a/fs/ceph/inode.c
+++ b/fs/ceph/inode.c
@@ -1230,11 +1230,11 @@ retry_lookup:
in = dn->d_inode;
} else {
in = ceph_get_inode(parent->d_sb, vino);
- if (in == NULL) {
+ if (IS_ERR(in)) {
dout("new_inode badness\n");
d_delete(dn);
dput(dn);
- err = -ENOMEM;
+ err = PTR_ERR(in);
goto out;
}
dn = splice_dentry(dn, in, NULL);
OpenPOWER on IntegriCloud