aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorDan Carpenter <error27@gmail.com>2010-05-29 09:42:19 +0000
committerChris Mason <chris.mason@oracle.com>2010-06-11 15:57:35 -0400
commit4cbd1149fbcc351bdf08ab749867d157905d0d35 (patch)
tree7acb025997c961e594116596a135d023361ee603 /fs
parent676e4c86391936795c82ccd11ca9671ee6307936 (diff)
downloadkernel_samsung_espresso10-4cbd1149fbcc351bdf08ab749867d157905d0d35.zip
kernel_samsung_espresso10-4cbd1149fbcc351bdf08ab749867d157905d0d35.tar.gz
kernel_samsung_espresso10-4cbd1149fbcc351bdf08ab749867d157905d0d35.tar.bz2
Btrfs: btrfs_iget() returns ERR_PTR
btrfs_iget() returns an ERR_PTR() on failure and not null. Signed-off-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/btrfs/super.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 9ea7114..859ddaa 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -392,8 +392,8 @@ setup_root:
location.offset = 0;
inode = btrfs_iget(sb, &location, new_root, &new);
- if (!inode)
- return ERR_PTR(-ENOMEM);
+ if (IS_ERR(inode))
+ return ERR_CAST(inode);
/*
* If we're just mounting the root most subvol put the inode and return