Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6

[~andy/linux] / fs / ubifs / super.c

diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
index 899066dd0c14393a3c55f5ab9988e62af95dfc7b..cd5900b85d38373cc4998a562152fcbe334f541f 100644 (file)
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
@@ -1311,6 +1311,8 @@ static int mount_ubifs(struct ubifs_info *c)
                        if (err)
                                goto out_orphans;
                        err = ubifs_rcvry_gc_commit(c);
+                       if (err)
+                               goto out_orphans;
                } else {
                        err = take_gc_lnum(c);
                        if (err)
@@ -1322,7 +1324,7 @@ static int mount_ubifs(struct ubifs_info *c)
                         */
                        err = ubifs_leb_unmap(c, c->gc_lnum);
                        if (err)
-                               return err;
+                               goto out_orphans;
                }
 
                err = dbg_check_lprops(c);