diff options
author | Christoph Hellwig <hch@infradead.org> | 2008-04-22 03:34:50 -0400 |
---|---|---|
committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-04-29 01:57:38 -0400 |
commit | ce46193bcaaf3c769718bcec6eae94719b8f53ed (patch) | |
tree | 8590e399e845d93953bd9ef47dd02581624e4afd /fs | |
parent | 45af6c6de6453b385c80555c0ee40ab5fc4a033b (diff) |
[XFS] kill XFS_ICSB_SB_LOCKED
With the last two patches XFS_ICSB_SB_LOCKED is never checked and only
superflously passed to xfs_icsb_count, so kill it.
SGI-PV: 976035
SGI-Modid: xfs-linux-melb:xfs-kern:30920a
Signed-off-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: David Chinner <dgc@sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/xfs/xfs_mount.c | 2 | ||||
-rw-r--r-- | fs/xfs/xfs_mount.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c index 8bdc16381bc5..da3988453b71 100644 --- a/fs/xfs/xfs_mount.c +++ b/fs/xfs/xfs_mount.c | |||
@@ -2221,7 +2221,7 @@ xfs_icsb_disable_counter( | |||
2221 | if (!test_and_set_bit(field, &mp->m_icsb_counters)) { | 2221 | if (!test_and_set_bit(field, &mp->m_icsb_counters)) { |
2222 | /* drain back to superblock */ | 2222 | /* drain back to superblock */ |
2223 | 2223 | ||
2224 | xfs_icsb_count(mp, &cnt, XFS_ICSB_SB_LOCKED|XFS_ICSB_LAZY_COUNT); | 2224 | xfs_icsb_count(mp, &cnt, XFS_ICSB_LAZY_COUNT); |
2225 | switch(field) { | 2225 | switch(field) { |
2226 | case XFS_SBS_ICOUNT: | 2226 | case XFS_SBS_ICOUNT: |
2227 | mp->m_sb.sb_icount = cnt.icsb_icount; | 2227 | mp->m_sb.sb_icount = cnt.icsb_icount; |
diff --git a/fs/xfs/xfs_mount.h b/fs/xfs/xfs_mount.h index 06ecaeb338a5..27b558ee576f 100644 --- a/fs/xfs/xfs_mount.h +++ b/fs/xfs/xfs_mount.h | |||
@@ -206,7 +206,6 @@ typedef struct xfs_icsb_cnts { | |||
206 | 206 | ||
207 | #define XFS_ICSB_FLAG_LOCK (1 << 0) /* counter lock bit */ | 207 | #define XFS_ICSB_FLAG_LOCK (1 << 0) /* counter lock bit */ |
208 | 208 | ||
209 | #define XFS_ICSB_SB_LOCKED (1 << 0) /* sb already locked */ | ||
210 | #define XFS_ICSB_LAZY_COUNT (1 << 1) /* accuracy not needed */ | 209 | #define XFS_ICSB_LAZY_COUNT (1 << 1) /* accuracy not needed */ |
211 | 210 | ||
212 | extern int xfs_icsb_init_counters(struct xfs_mount *); | 211 | extern int xfs_icsb_init_counters(struct xfs_mount *); |