Merge tag 'kgdb-5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux

[linux.git] / fs / reiserfs / super.c

diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
index 3244037b1286de881e45ae440689118555ee3ec7..a6bce5b1fb1dcd3cf1889f2ff0a13cc23f5d4ea6 100644 (file)
--- a/fs/reiserfs/super.c
+++ b/fs/reiserfs/super.c
@@ -629,6 +629,7 @@ static void reiserfs_put_super(struct super_block *s)
        reiserfs_write_unlock(s);
        mutex_destroy(&REISERFS_SB(s)->lock);
        destroy_workqueue(REISERFS_SB(s)->commit_wq);
+       kfree(REISERFS_SB(s)->s_jdev);
        kfree(s->s_fs_info);
        s->s_fs_info = NULL;
 }
@@ -1947,7 +1948,7 @@ static int reiserfs_fill_super(struct super_block *s, void *data, int silent)
                if (!sbi->s_jdev) {
                        SWARN(silent, s, "", "Cannot allocate memory for "
                                "journal device name");
-                       goto error;
+                       goto error_unlocked;
                }
        }
 #ifdef CONFIG_QUOTA
@@ -2240,6 +2241,7 @@ static int reiserfs_fill_super(struct super_block *s, void *data, int silent)
                        kfree(qf_names[j]);
        }
 #endif
+       kfree(sbi->s_jdev);
        kfree(sbi);
 
        s->s_fs_info = NULL;