[XFS] move root inode IRELE into xfs_unmountfs

[linux-2.6-omap-h63xx.git] / fs / xfs / xfs_mount.c

diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c
index 6c5d1325e7f65661ce35a765badac586b474fd01..73f0ba1ec197e102e58008c07bcf12c7d17d81c8 100644 (file)
--- a/fs/xfs/xfs_mount.c
+++ b/fs/xfs/xfs_mount.c
@@ -146,13 +146,6 @@ xfs_mount_free(
        mutex_destroy(&mp->m_growlock);
        if (mp->m_quotainfo)
                XFS_QM_DONE(mp);
-
-       if (mp->m_fsname != NULL)
-               kmem_free(mp->m_fsname);
-       if (mp->m_rtname != NULL)
-               kmem_free(mp->m_rtname);
-       if (mp->m_logname != NULL)
-               kmem_free(mp->m_logname);
 }
 
 /*
@@ -1257,6 +1250,8 @@ xfs_unmountfs(xfs_mount_t *mp)
        __uint64_t      resblks;
        int             error = 0;
 
+       IRELE(mp->m_rootip);
+
        /*
         * We can potentially deadlock here if we have an inode cluster
         * that has been freed has it's buffer still pinned in memory because
@@ -1322,7 +1317,7 @@ xfs_unmountfs(xfs_mount_t *mp)
        if ((mp->m_flags & XFS_MOUNT_NOUUID) == 0)
                uuid_table_remove(&mp->m_sb.sb_uuid);
 
-#if defined(DEBUG) || defined(INDUCE_IO_ERROR)
+#if defined(DEBUG)
        xfs_errortag_clearall(mp, 0);
 #endif
        xfs_mount_free(mp);