Merge git://oss.sgi.com:8090/xfs/linux-2.6

[linux-2.6] / fs / xfs / linux-2.6 / xfs_super.c

diff --git a/fs/xfs/linux-2.6/xfs_super.c b/fs/xfs/linux-2.6/xfs_super.c
index 9ccbb1ca277b74c0eca2b4cddf758a2b0b9ea993..73c65f19e549f34dbf569cea7937b5971c44685e 100644 (file)
--- a/fs/xfs/linux-2.6/xfs_super.c
+++ b/fs/xfs/linux-2.6/xfs_super.c
@@ -1147,6 +1147,7 @@ xfs_fs_put_super(
        }
 
        xfs_unmountfs(mp);
+       xfs_freesb(mp);
        xfs_icsb_destroy_counters(mp);
        xfs_close_devices(mp);
        xfs_qmops_put(mp);
@@ -1722,7 +1723,7 @@ xfs_fs_fill_super(
        if (error)
                goto out_free_sb;
 
-       error = xfs_mountfs(mp, flags);
+       error = xfs_mountfs(mp);
        if (error)
                goto out_filestream_unmount;
 
@@ -1803,7 +1804,7 @@ xfs_fs_fill_super(
        WARN_ON(error);
 
        xfs_unmountfs(mp);
-       goto out_free_fsname;
+       goto out_free_sb;
 }
 
 STATIC int