From 2c7100966461dec163e6b5a072392074aeef6947 Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Tue, 20 May 2008 15:11:05 +1000 Subject: [PATCH] --- yaml --- r: 107423 b: refs/heads/master c: effa2eda3ab9c013585349b8afd305dc5decf771 h: refs/heads/master i: 107421: 0b105d22ca4748a18d049eebe1d9c80cd47527c0 107419: 68e18fb2ec746bd8cf45aafdcac63095996f8507 107415: 1e778f8145f694719daafb79fa150b90f963b0ae 107407: ae4163cb76e87e282a89d58862a079ffd8285a0b 107391: 0b59a8025d40456caf66604b472b50b1b9d0dc86 v: v3 --- [refs] | 2 +- trunk/fs/xfs/linux-2.6/xfs_super.c | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index d5a769f57e80..b83f907d5ab8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 95db4e21b72603217f0bcafa4da9ee01fc1d2389 +refs/heads/master: effa2eda3ab9c013585349b8afd305dc5decf771 diff --git a/trunk/fs/xfs/linux-2.6/xfs_super.c b/trunk/fs/xfs/linux-2.6/xfs_super.c index d2155b1de10c..4c662d63d626 100644 --- a/trunk/fs/xfs/linux-2.6/xfs_super.c +++ b/trunk/fs/xfs/linux-2.6/xfs_super.c @@ -1795,22 +1795,22 @@ xfs_fs_fill_super( goto out_destroy_counters; error = xfs_finish_flags(args, mp); if (error) - goto error2; + goto out_free_sb; error = xfs_setup_devices(mp); if (error) - goto error2; + goto out_free_sb; if (mp->m_flags & XFS_MOUNT_BARRIER) xfs_mountfs_check_barriers(mp); error = xfs_filestream_mount(mp); if (error) - goto error2; + goto out_free_sb; error = xfs_mountfs(mp, flags); if (error) - goto error2; + goto out_free_sb; XFS_SEND_MOUNT(mp, DM_RIGHT_NULL, args->mtpt, args->fsname); @@ -1850,9 +1850,8 @@ xfs_fs_fill_super( kfree(args); return 0; - error2: - if (mp->m_sb_bp) - xfs_freesb(mp); + out_free_sb: + xfs_freesb(mp); out_destroy_counters: xfs_icsb_destroy_counters(mp); xfs_close_devices(mp);