Merge tag 'upstream-3.13-rc1' of git://git.infradead.org/linux-ubifs

[karo-tx-linux.git] / fs / ubifs / super.c

diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
index 3e4aa7281e04b38ecc8063e64d22ccef34c6291f..f69daa514a57a0827a55c47f4680dcb5e69ec746 100644 (file)
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
@@ -1630,8 +1630,10 @@ static int ubifs_remount_rw(struct ubifs_info *c)
        }
 
        c->write_reserve_buf = kmalloc(COMPRESSED_DATA_NODE_BUF_SZ, GFP_KERNEL);
-       if (!c->write_reserve_buf)
+       if (!c->write_reserve_buf) {
+               err = -ENOMEM;
                goto out;
+       }
 
        err = ubifs_lpt_init(c, 0, 1);
        if (err)
@@ -2064,8 +2066,10 @@ static int ubifs_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) {
+               err = -ENOMEM;
                goto out_umount;
+       }
 
        mutex_unlock(&c->umount_mutex);
        return 0;