Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce46193b authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Lachlan McIlroy
Browse files

[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: default avatarChristoph Hellwig <hch@infradead.org>
Signed-off-by: default avatarDavid Chinner <dgc@sgi.com>
Signed-off-by: default avatarLachlan McIlroy <lachlan@sgi.com>
parent 45af6c6d

fs/xfs/xfs_mount.c

+1 −1
Original line number Diff line number Diff line
@@ -2221,7 +2221,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
Original line number Diff line number Diff line
@@ -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 *);