Commit fa6c668d authored by Eric Sandeen's avatar Eric Sandeen Committed by Darrick J. Wong
Browse files

xfs: remove b_last_holder & associated macros 



The old lock tracking infrastructure in xfs using the b_last_holder
field seems to only be useful if you can get into the system with a
debugger; it seems that the existing tracepoints would be the way to
go these days, and this old infrastructure can be removed.

Signed-off-by: default avatarEric Sandeen <sandeen@redhat.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent 10259de1

fs/xfs/xfs.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -8,7 +8,6 @@ 




#ifdef CONFIG_XFS_DEBUG

#ifdef CONFIG_XFS_DEBUG

#define DEBUG 1

#define DEBUG 1

#define XFS_BUF_LOCK_TRACKING 1

#endif

#endif





#ifdef CONFIG_XFS_ASSERT_FATAL

#ifdef CONFIG_XFS_ASSERT_FATAL

fs/xfs/xfs_buf.c

+2 −18
Original line number Original line Diff line number Diff line
@@ -34,16 +34,6 @@ 




static kmem_zone_t *xfs_buf_zone;

static kmem_zone_t *xfs_buf_zone;





#ifdef XFS_BUF_LOCK_TRACKING

# define XB_SET_OWNER(bp)	((bp)->b_last_holder = current->pid)

# define XB_CLEAR_OWNER(bp)	((bp)->b_last_holder = -1)

# define XB_GET_OWNER(bp)	((bp)->b_last_holder)

#else

# define XB_SET_OWNER(bp)	do { } while (0)

# define XB_CLEAR_OWNER(bp)	do { } while (0)

# define XB_GET_OWNER(bp)	do { } while (0)

#endif



#define xb_to_gfp(flags) \

#define xb_to_gfp(flags) \

	((((flags) & XBF_READ_AHEAD) ? __GFP_NORETRY : GFP_NOFS) | __GFP_NOWARN)

	((((flags) & XBF_READ_AHEAD) ? __GFP_NORETRY : GFP_NOFS) | __GFP_NOWARN)
@@ -226,7 +216,6 @@ _xfs_buf_alloc( 
	INIT_LIST_HEAD(&bp->b_li_list);

	INIT_LIST_HEAD(&bp->b_li_list);

	sema_init(&bp->b_sema, 0); /* held, no waiters */

	sema_init(&bp->b_sema, 0); /* held, no waiters */

	spin_lock_init(&bp->b_lock);

	spin_lock_init(&bp->b_lock);

	XB_SET_OWNER(bp);

	bp->b_target = target;

	bp->b_target = target;

	bp->b_flags = flags;

	bp->b_flags = flags;
@@ -1091,12 +1080,10 @@ xfs_buf_trylock( 
	int			locked;

	int			locked;





	locked = down_trylock(&bp->b_sema) == 0;

	locked = down_trylock(&bp->b_sema) == 0;

	if (locked) {

	if (locked)

		XB_SET_OWNER(bp);

		trace_xfs_buf_trylock(bp, _RET_IP_);

		trace_xfs_buf_trylock(bp, _RET_IP_);

	} else {

	else

		trace_xfs_buf_trylock_fail(bp, _RET_IP_);

		trace_xfs_buf_trylock_fail(bp, _RET_IP_);

	}

	return locked;

	return locked;

}

}
@@ -1118,7 +1105,6 @@ xfs_buf_lock( 
	if (atomic_read(&bp->b_pin_count) && (bp->b_flags & XBF_STALE))

	if (atomic_read(&bp->b_pin_count) && (bp->b_flags & XBF_STALE))

		xfs_log_force(bp->b_target->bt_mount, 0);

		xfs_log_force(bp->b_target->bt_mount, 0);

	down(&bp->b_sema);

	down(&bp->b_sema);

	XB_SET_OWNER(bp);





	trace_xfs_buf_lock_done(bp, _RET_IP_);

	trace_xfs_buf_lock_done(bp, _RET_IP_);

}

}
@@ -1129,9 +1115,7 @@ xfs_buf_unlock( 
{

{

	ASSERT(xfs_buf_islocked(bp));

	ASSERT(xfs_buf_islocked(bp));





	XB_CLEAR_OWNER(bp);

	up(&bp->b_sema);

	up(&bp->b_sema);



	trace_xfs_buf_unlock(bp, _RET_IP_);

	trace_xfs_buf_unlock(bp, _RET_IP_);

}

}

fs/xfs/xfs_buf.h

+0 −4
Original line number Original line Diff line number Diff line
@@ -198,10 +198,6 @@ typedef struct xfs_buf { 
	int			b_last_error;

	int			b_last_error;





	const struct xfs_buf_ops	*b_ops;

	const struct xfs_buf_ops	*b_ops;



#ifdef XFS_BUF_LOCK_TRACKING

	int			b_last_holder;

#endif

} xfs_buf_t;

} xfs_buf_t;





/* Finding and Reading Buffers */

/* Finding and Reading Buffers */

CRA Git | Maintained and supported by SUSTech CRA and CCSE