From 53b34606a9d6e733740256c7ac5dfe34634434f9 Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Wed, 13 Aug 2008 16:49:04 +1000 Subject: [PATCH] --- yaml --- r: 108333 b: refs/heads/master c: 77508ec8e6ed72c9ba8ca74248a7aabd664e3f57 h: refs/heads/master i: 108331: 634aa77ea610b966804f5b7407e1c62f2a0b5a95 v: v3 --- [refs] | 2 +- trunk/fs/xfs/linux-2.6/xfs_super.c | 4 ---- trunk/fs/xfs/xfs_mount.c | 2 ++ 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index ecf37ca7e730..b8d66b3e0788 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3a76c1ea07ee4e9da7c8e476e43be7e1b2bf24fb +refs/heads/master: 77508ec8e6ed72c9ba8ca74248a7aabd664e3f57 diff --git a/trunk/fs/xfs/linux-2.6/xfs_super.c b/trunk/fs/xfs/linux-2.6/xfs_super.c index 0eaad84a6803..9ccbb1ca277b 100644 --- a/trunk/fs/xfs/linux-2.6/xfs_super.c +++ b/trunk/fs/xfs/linux-2.6/xfs_super.c @@ -1131,8 +1131,6 @@ xfs_fs_put_super( error = xfs_unmount_flush(mp, 0); WARN_ON(error); - IRELE(rip); - /* * If we're forcing a shutdown, typically because of a media error, * we want to make sure we invalidate dirty pages that belong to @@ -1804,8 +1802,6 @@ xfs_fs_fill_super( error = xfs_unmount_flush(mp, 0); WARN_ON(error); - IRELE(mp->m_rootip); - xfs_unmountfs(mp); goto out_free_fsname; } diff --git a/trunk/fs/xfs/xfs_mount.c b/trunk/fs/xfs/xfs_mount.c index 6b4350700c0d..73f0ba1ec197 100644 --- a/trunk/fs/xfs/xfs_mount.c +++ b/trunk/fs/xfs/xfs_mount.c @@ -1250,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