diff options
author | Dan Carpenter <error27@gmail.com> | 2010-08-25 03:11:35 -0400 |
---|---|---|
committer | Sage Weil <sage@newdream.net> | 2010-08-25 15:01:54 -0400 |
commit | ac1f12ef569d49b013c3db86e11be7e15d66b1c3 (patch) | |
tree | 79ca92f4f4c08a14629ff6b2b3b74d2eb7fac5eb /fs/ceph | |
parent | 36e21687e6e51c4225c42e6291938363f7bbfa7c (diff) |
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/ceph')
-rw-r--r-- | fs/ceph/inode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c index 3e6b52cb5ee8..e7cca414da03 100644 --- a/fs/ceph/inode.c +++ b/fs/ceph/inode.c | |||
@@ -1230,11 +1230,11 @@ retry_lookup: | |||
1230 | in = dn->d_inode; | 1230 | in = dn->d_inode; |
1231 | } else { | 1231 | } else { |
1232 | in = ceph_get_inode(parent->d_sb, vino); | 1232 | in = ceph_get_inode(parent->d_sb, vino); |
1233 | if (in == NULL) { | 1233 | if (IS_ERR(in)) { |
1234 | dout("new_inode badness\n"); | 1234 | dout("new_inode badness\n"); |
1235 | d_delete(dn); | 1235 | d_delete(dn); |
1236 | dput(dn); | 1236 | dput(dn); |
1237 | err = -ENOMEM; | 1237 | err = PTR_ERR(in); |
1238 | goto out; | 1238 | goto out; |
1239 | } | 1239 | } |
1240 | dn = splice_dentry(dn, in, NULL); | 1240 | dn = splice_dentry(dn, in, NULL); |