kill XFS_ICSB_SB_LOCKED

PATCH In review Christoph Hellwig 1 participant 1 message Mar 19, 2008 XFS filesystem

Share & tools

Christoph Hellwig

author

2008-03-19 20:44 UTC #0 lore raw

PATCH 3/3 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.

Signed-off-by Christoph Hellwig <[email protected]>

fs/xfs/xfs_mount.c +1 -1

Index: linux-2.6-xfs/fs/xfs/xfs_mount.c
===================================================================
@@ -2193,7 +2193,7 @@ xfs_icsb_disable_counter(
 	if (!test_and_set_bit(field, &mp->m_icsb_counters)) {
 		/* drain back to superblock */
 
-		xfs_icsb_count(mp, &cnt, XFS_ICSB_SB_LOCKED|XFS_ICSB_LAZY_COUNT);
+		xfs_icsb_count(mp, &cnt, XFS_ICSB_LAZY_COUNT);
 		switch(field) {
 		case XFS_SBS_ICOUNT:
 			mp->m_sb.sb_icount = cnt.icsb_icount;

fs/xfs/xfs_mount.h +0 -1

Index: linux-2.6-xfs/fs/xfs/xfs_mount.h
===================================================================
@@ -206,7 +206,6 @@ typedef struct xfs_icsb_cnts {
 
 #define XFS_ICSB_FLAG_LOCK	(1 << 0)	/* counter lock bit */
 
-#define XFS_ICSB_SB_LOCKED	(1 << 0)	/* sb already locked */
 #define XFS_ICSB_LAZY_COUNT	(1 << 1)	/* accuracy not needed */
 
 extern int	xfs_icsb_init_counters(struct xfs_mount *);