summaryrefslogtreecommitdiffstats
path: root/fs/omfs
diff options
context:
space:
mode:
authorBob Copeland <me@bobcopeland.com>2015-05-28 15:44:32 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-05-28 18:25:18 -0700
commit3a281f946640542a7a7372f436e101ee1fbc4c97 (patch)
tree9a7daf596ddab002528fac2fa2f5b5b4e9eb033f /fs/omfs
parentdcbff39da3d815f08750552fdd04f96b51751129 (diff)
downloadlinux-stable-3a281f946640542a7a7372f436e101ee1fbc4c97.tar.gz
linux-stable-3a281f946640542a7a7372f436e101ee1fbc4c97.tar.bz2
linux-stable-3a281f946640542a7a7372f436e101ee1fbc4c97.zip
omfs: set error return when d_make_root() fails
A static checker found the following issue in the error path for omfs_fill_super: fs/omfs/inode.c:552 omfs_fill_super() warn: missing error code here? 'd_make_root()' failed. 'ret' = '0' Fix by returning -ENOMEM in this case. Signed-off-by: Bob Copeland <me@bobcopeland.com> Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/omfs')
-rw-r--r--fs/omfs/inode.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/omfs/inode.c b/fs/omfs/inode.c
index 70d4191cf33d..6ce542c11f98 100644
--- a/fs/omfs/inode.c
+++ b/fs/omfs/inode.c
@@ -549,8 +549,10 @@ static int omfs_fill_super(struct super_block *sb, void *data, int silent)
}
sb->s_root = d_make_root(root);
- if (!sb->s_root)
+ if (!sb->s_root) {
+ ret = -ENOMEM;
goto out_brelse_bh2;
+ }
printk(KERN_DEBUG "omfs: Mounted volume %s\n", omfs_rb->r_name);
ret = 0;