diff options
author | Dave Chinner <david@fromorbit.com> | 2010-07-12 02:40:58 -0400 |
---|---|---|
committer | Alex Elder <aelder@sgi.com> | 2010-07-26 14:16:47 -0400 |
commit | a4190f90b4e22bde8b01b0086e00dd95439e2edd (patch) | |
tree | e92d34f18af6f06c0f637345286579d66c7fc659 /fs/xfs | |
parent | fa17b25e9f95375081b43a741cf1c188682ec588 (diff) |
xfs: move inode shrinker unregister even earlier
I missed Dave Chinner's second revision of this change, and pushed
his first version out to the repository instead.
commit a476c59ebb279d738718edc0e3fb76aab3687114
Author: Dave Chinner <dchinner@redhat.com>
This commit compensates for that by moving a block of code up a bit
further, with a result that matches the the effect of Dave's second
version.
Dave's first version was:
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Dave's second version was:
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Alex Elder <aelder@sgi.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Diffstat (limited to 'fs/xfs')
-rw-r--r-- | fs/xfs/linux-2.6/xfs_super.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/xfs/linux-2.6/xfs_super.c b/fs/xfs/linux-2.6/xfs_super.c index c734bc6cf32e..8c4f4476e5c2 100644 --- a/fs/xfs/linux-2.6/xfs_super.c +++ b/fs/xfs/linux-2.6/xfs_super.c | |||
@@ -1145,6 +1145,11 @@ xfs_fs_put_super( | |||
1145 | { | 1145 | { |
1146 | struct xfs_mount *mp = XFS_M(sb); | 1146 | struct xfs_mount *mp = XFS_M(sb); |
1147 | 1147 | ||
1148 | /* | ||
1149 | * Unregister the memory shrinker before we tear down the mount | ||
1150 | * structure so we don't have memory reclaim racing with us here. | ||
1151 | */ | ||
1152 | xfs_inode_shrinker_unregister(mp); | ||
1148 | xfs_syncd_stop(mp); | 1153 | xfs_syncd_stop(mp); |
1149 | 1154 | ||
1150 | /* | 1155 | /* |
@@ -1156,11 +1161,6 @@ xfs_fs_put_super( | |||
1156 | 1161 | ||
1157 | XFS_bflush(mp->m_ddev_targp); | 1162 | XFS_bflush(mp->m_ddev_targp); |
1158 | 1163 | ||
1159 | /* | ||
1160 | * Unregister the memory shrinker before we tear down the mount | ||
1161 | * structure so we don't have memory reclaim racing with us here. | ||
1162 | */ | ||
1163 | xfs_inode_shrinker_unregister(mp); | ||
1164 | xfs_unmountfs(mp); | 1164 | xfs_unmountfs(mp); |
1165 | xfs_freesb(mp); | 1165 | xfs_freesb(mp); |
1166 | xfs_icsb_destroy_counters(mp); | 1166 | xfs_icsb_destroy_counters(mp); |