aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@infradead.org>2008-08-13 02:49:04 -0400
committerLachlan McIlroy <lachlan@redback.melbourne.sgi.com>2008-08-13 02:49:04 -0400
commit77508ec8e6ed72c9ba8ca74248a7aabd664e3f57 (patch)
treed43fbde9c21fa21b8d3b791a18ee0d98af2f6102
parent3a76c1ea07ee4e9da7c8e476e43be7e1b2bf24fb (diff)
[XFS] move root inode IRELE into xfs_unmountfs
The root inode is allocated in xfs_mountfs so it should be release in xfs_unmountfs. For the unmount case that means we do it after the the xfs_sync(mp, SYNC_WAIT | SYNC_CLOSE) in the forced shutdown case and the dmapi unmount event. Note that both reference the rip variable which might be freed by that time in case inode flushing has kicked in, so strictly speaking this might count as a bug fix SGI-PV: 981498 SGI-Modid: xfs-linux-melb:xfs-kern:31830a Signed-off-by: Christoph Hellwig <hch@infradead.org> Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
-rw-r--r--fs/xfs/linux-2.6/xfs_super.c4
-rw-r--r--fs/xfs/xfs_mount.c2
2 files changed, 2 insertions, 4 deletions
diff --git a/fs/xfs/linux-2.6/xfs_super.c b/fs/xfs/linux-2.6/xfs_super.c
index 0eaad84a6803..9ccbb1ca277b 100644
--- a/fs/xfs/linux-2.6/xfs_super.c
+++ b/fs/xfs/linux-2.6/xfs_super.c
@@ -1131,8 +1131,6 @@ xfs_fs_put_super(
1131 error = xfs_unmount_flush(mp, 0); 1131 error = xfs_unmount_flush(mp, 0);
1132 WARN_ON(error); 1132 WARN_ON(error);
1133 1133
1134 IRELE(rip);
1135
1136 /* 1134 /*
1137 * If we're forcing a shutdown, typically because of a media error, 1135 * If we're forcing a shutdown, typically because of a media error,
1138 * we want to make sure we invalidate dirty pages that belong to 1136 * we want to make sure we invalidate dirty pages that belong to
@@ -1804,8 +1802,6 @@ xfs_fs_fill_super(
1804 error = xfs_unmount_flush(mp, 0); 1802 error = xfs_unmount_flush(mp, 0);
1805 WARN_ON(error); 1803 WARN_ON(error);
1806 1804
1807 IRELE(mp->m_rootip);
1808
1809 xfs_unmountfs(mp); 1805 xfs_unmountfs(mp);
1810 goto out_free_fsname; 1806 goto out_free_fsname;
1811} 1807}
diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c
index 6b4350700c0d..73f0ba1ec197 100644
--- a/fs/xfs/xfs_mount.c
+++ b/fs/xfs/xfs_mount.c
@@ -1250,6 +1250,8 @@ xfs_unmountfs(xfs_mount_t *mp)
1250 __uint64_t resblks; 1250 __uint64_t resblks;
1251 int error = 0; 1251 int error = 0;
1252 1252
1253 IRELE(mp->m_rootip);
1254
1253 /* 1255 /*
1254 * We can potentially deadlock here if we have an inode cluster 1256 * We can potentially deadlock here if we have an inode cluster
1255 * that has been freed has it's buffer still pinned in memory because 1257 * that has been freed has it's buffer still pinned in memory because