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

Commit ff6d6af2 authored by Bill O'Donnell's avatar Bill O'Donnell Committed by Dave Chinner
Browse files

xfs: per-filesystem stats counter implementation 



This patch modifies the stats counting macros and the callers
to those macros to properly increment, decrement, and add-to
the xfs stats counts. The counts for global and per-fs stats
are correctly advanced, and cleared by writing a "1" to the
corresponding clear file.

global counts: /sys/fs/xfs/stats/stats
per-fs counts: /sys/fs/xfs/sda*/stats/stats

global clear:  /sys/fs/xfs/stats/stats_clear
per-fs clear:  /sys/fs/xfs/sda*/stats/stats_clear

[dchinner: cleaned up macro variables, removed CONFIG_FS_PROC around
 stats structures and macros. ]

Signed-off-by: default avatarBill O'Donnell <billodo@redhat.com>
Reviewed-by: default avatarEric Sandeen <sandeen@redhat.com>
Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
parent 225e4635

fs/xfs/libxfs/xfs_alloc.c

+4 −4
Original line number Diff line number Diff line
@@ -651,8 +651,8 @@ xfs_alloc_ag_vextent( 
				 -((long)(args->len)));

	}



	XFS_STATS_INC(xs_allocx);

	XFS_STATS_ADD(xs_allocb, args->len);

	XFS_STATS_INC(args->mp, xs_allocx);

	XFS_STATS_ADD(args->mp, xs_allocb, args->len);

	return error;

}
@@ -1808,8 +1808,8 @@ xfs_free_ag_extent( 


	if (!isfl)

		xfs_trans_mod_sb(tp, XFS_TRANS_SB_FDBLOCKS, (long)len);

	XFS_STATS_INC(xs_freex);

	XFS_STATS_ADD(xs_freeb, len);

	XFS_STATS_INC(mp, xs_freex);

	XFS_STATS_ADD(mp, xs_freeb, len);



	trace_xfs_free_extent(mp, agno, bno, len, isfl, haveleft, haveright);

fs/xfs/libxfs/xfs_attr.c

+3 −3
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ xfs_attr_get( 
	uint			lock_mode;

	int			error;



	XFS_STATS_INC(xs_attr_get);

	XFS_STATS_INC(ip->i_mount, xs_attr_get);



	if (XFS_FORCED_SHUTDOWN(ip->i_mount))

		return -EIO;
@@ -209,7 +209,7 @@ xfs_attr_set( 
	int			rsvd = (flags & ATTR_ROOT) != 0;

	int			error, err2, committed, local;



	XFS_STATS_INC(xs_attr_set);

	XFS_STATS_INC(mp, xs_attr_set);



	if (XFS_FORCED_SHUTDOWN(dp->i_mount))

		return -EIO;
@@ -412,7 +412,7 @@ xfs_attr_remove( 
	xfs_fsblock_t		firstblock;

	int			error;



	XFS_STATS_INC(xs_attr_remove);

	XFS_STATS_INC(mp, xs_attr_remove);



	if (XFS_FORCED_SHUTDOWN(dp->i_mount))

		return -EIO;

fs/xfs/libxfs/xfs_bmap.c

+10 −10
Original line number Diff line number Diff line
@@ -1435,7 +1435,7 @@ xfs_bmap_search_extents( 
	xfs_ifork_t	*ifp;		/* inode fork pointer */

	xfs_bmbt_rec_host_t  *ep;            /* extent record pointer */



	XFS_STATS_INC(xs_look_exlist);

	XFS_STATS_INC(ip->i_mount, xs_look_exlist);

	ifp = XFS_IFORK_PTR(ip, fork);



	ep = xfs_bmap_search_multi_extents(ifp, bno, eofp, lastxp, gotp, prevp);
@@ -1732,7 +1732,7 @@ xfs_bmap_add_extent_delay_real( 
	ASSERT(!bma->cur ||

	       (bma->cur->bc_private.b.flags & XFS_BTCUR_BPRV_WASDEL));



	XFS_STATS_INC(xs_add_exlist);

	XFS_STATS_INC(mp, xs_add_exlist);



#define	LEFT		r[0]

#define	RIGHT		r[1]
@@ -2286,7 +2286,7 @@ xfs_bmap_add_extent_unwritten_real( 
	ASSERT(*idx <= ifp->if_bytes / sizeof(struct xfs_bmbt_rec));

	ASSERT(!isnullstartblock(new->br_startblock));



	XFS_STATS_INC(xs_add_exlist);

	XFS_STATS_INC(mp, xs_add_exlist);



#define	LEFT		r[0]

#define	RIGHT		r[1]
@@ -2946,7 +2946,7 @@ xfs_bmap_add_extent_hole_real( 
	ASSERT(!bma->cur ||

	       !(bma->cur->bc_private.b.flags & XFS_BTCUR_BPRV_WASDEL));



	XFS_STATS_INC(xs_add_exlist);

	XFS_STATS_INC(mp, xs_add_exlist);



	state = 0;

	if (whichfork == XFS_ATTR_FORK)
@@ -4036,7 +4036,7 @@ xfs_bmapi_read( 
	if (XFS_FORCED_SHUTDOWN(mp))

		return -EIO;



	XFS_STATS_INC(xs_blk_mapr);

	XFS_STATS_INC(mp, xs_blk_mapr);



	ifp = XFS_IFORK_PTR(ip, whichfork);
@@ -4221,7 +4221,7 @@ xfs_bmapi_delay( 
	if (XFS_FORCED_SHUTDOWN(mp))

		return -EIO;



	XFS_STATS_INC(xs_blk_mapw);

	XFS_STATS_INC(mp, xs_blk_mapw);



	if (!(ifp->if_flags & XFS_IFEXTENTS)) {

		error = xfs_iread_extents(NULL, ip, XFS_DATA_FORK);
@@ -4525,7 +4525,7 @@ xfs_bmapi_write( 


	ifp = XFS_IFORK_PTR(ip, whichfork);



	XFS_STATS_INC(xs_blk_mapw);

	XFS_STATS_INC(mp, xs_blk_mapw);



	if (*firstblock == NULLFSBLOCK) {

		if (XFS_IFORK_FORMAT(ip, whichfork) == XFS_DINODE_FMT_BTREE)
@@ -4718,12 +4718,12 @@ xfs_bmap_del_extent( 
	xfs_filblks_t		temp2;	/* for indirect length calculations */

	int			state = 0;



	XFS_STATS_INC(xs_del_exlist);

	mp = ip->i_mount;

	XFS_STATS_INC(mp, xs_del_exlist);



	if (whichfork == XFS_ATTR_FORK)

		state |= BMAP_ATTRFORK;



	mp = ip->i_mount;

	ifp = XFS_IFORK_PTR(ip, whichfork);

	ASSERT((*idx >= 0) && (*idx < ifp->if_bytes /

		(uint)sizeof(xfs_bmbt_rec_t)));
@@ -5070,7 +5070,7 @@ xfs_bunmapi( 
		*done = 1;

		return 0;

	}

	XFS_STATS_INC(xs_blk_unmap);

	XFS_STATS_INC(mp, xs_blk_unmap);

	isrt = (whichfork == XFS_DATA_FORK) && XFS_IS_REALTIME_INODE(ip);

	start = bno;

	bno = start + len - 1;

fs/xfs/libxfs/xfs_btree.h

+23 −16
Original line number Diff line number Diff line
@@ -84,30 +84,37 @@ union xfs_btree_rec { 
/*

 * Generic stats interface

 */

#define __XFS_BTREE_STATS_INC(type, stat) \

	XFS_STATS_INC(xs_ ## type ## _2_ ## stat)

#define __XFS_BTREE_STATS_INC(mp, type, stat) \

	XFS_STATS_INC(mp, xs_ ## type ## _2_ ## stat)

#define XFS_BTREE_STATS_INC(cur, stat)	\

do {    \

	struct xfs_mount *__mp = cur->bc_mp; \

	switch (cur->bc_btnum) {  \

	case XFS_BTNUM_BNO: __XFS_BTREE_STATS_INC(abtb, stat); break;	\

	case XFS_BTNUM_CNT: __XFS_BTREE_STATS_INC(abtc, stat); break;	\

	case XFS_BTNUM_BMAP: __XFS_BTREE_STATS_INC(bmbt, stat); break;	\

	case XFS_BTNUM_INO: __XFS_BTREE_STATS_INC(ibt, stat); break;	\

	case XFS_BTNUM_FINO: __XFS_BTREE_STATS_INC(fibt, stat); break;	\

	case XFS_BTNUM_BNO: __XFS_BTREE_STATS_INC(__mp, abtb, stat); break; \

	case XFS_BTNUM_CNT: __XFS_BTREE_STATS_INC(__mp, abtc, stat); break; \

	case XFS_BTNUM_BMAP: __XFS_BTREE_STATS_INC(__mp, bmbt, stat); break; \

	case XFS_BTNUM_INO: __XFS_BTREE_STATS_INC(__mp, ibt, stat); break; \

	case XFS_BTNUM_FINO: __XFS_BTREE_STATS_INC(__mp, fibt, stat); break; \

	case XFS_BTNUM_MAX: ASSERT(0); /* fucking gcc */ ; break;	\

	}       \

} while (0)



#define __XFS_BTREE_STATS_ADD(type, stat, val) \

	XFS_STATS_ADD(xs_ ## type ## _2_ ## stat, val)

#define __XFS_BTREE_STATS_ADD(mp, type, stat, val) \

	XFS_STATS_ADD(mp, xs_ ## type ## _2_ ## stat, val)

#define XFS_BTREE_STATS_ADD(cur, stat, val)  \

do {    \

	struct xfs_mount *__mp = cur->bc_mp; \

	switch (cur->bc_btnum) {  \

	case XFS_BTNUM_BNO: __XFS_BTREE_STATS_ADD(abtb, stat, val); break; \

	case XFS_BTNUM_CNT: __XFS_BTREE_STATS_ADD(abtc, stat, val); break; \

	case XFS_BTNUM_BMAP: __XFS_BTREE_STATS_ADD(bmbt, stat, val); break; \

	case XFS_BTNUM_INO: __XFS_BTREE_STATS_ADD(ibt, stat, val); break; \

	case XFS_BTNUM_FINO: __XFS_BTREE_STATS_ADD(fibt, stat, val); break; \

	case XFS_BTNUM_BNO:	\

		__XFS_BTREE_STATS_ADD(__mp, abtb, stat, val); break; \

	case XFS_BTNUM_CNT:	\

		__XFS_BTREE_STATS_ADD(__mp, abtc, stat, val); break; \

	case XFS_BTNUM_BMAP:	\

		__XFS_BTREE_STATS_ADD(__mp, bmbt, stat, val); break; \

	case XFS_BTNUM_INO:	\

		__XFS_BTREE_STATS_ADD(__mp, ibt, stat, val); break; \

	case XFS_BTNUM_FINO:	\

		__XFS_BTREE_STATS_ADD(__mp, fibt, stat, val); break; \

	case XFS_BTNUM_MAX: ASSERT(0); /* fucking gcc */ ; break; \

	}       \

} while (0)

fs/xfs/libxfs/xfs_dir2.c

+3 −3
Original line number Diff line number Diff line
@@ -271,7 +271,7 @@ xfs_dir_createname( 
		rval = xfs_dir_ino_validate(tp->t_mountp, inum);

		if (rval)

			return rval;

		XFS_STATS_INC(xs_dir_create);

		XFS_STATS_INC(dp->i_mount, xs_dir_create);

	}



	args = kmem_zalloc(sizeof(*args), KM_SLEEP | KM_NOFS);
@@ -365,7 +365,7 @@ xfs_dir_lookup( 
	int		lock_mode;



	ASSERT(S_ISDIR(dp->i_d.di_mode));

	XFS_STATS_INC(xs_dir_lookup);

	XFS_STATS_INC(dp->i_mount, xs_dir_lookup);



	/*

	 * We need to use KM_NOFS here so that lockdep will not throw false
@@ -444,7 +444,7 @@ xfs_dir_removename( 
	int		v;		/* type-checking value */



	ASSERT(S_ISDIR(dp->i_d.di_mode));

	XFS_STATS_INC(xs_dir_remove);

	XFS_STATS_INC(dp->i_mount, xs_dir_remove);



	args = kmem_zalloc(sizeof(*args), KM_SLEEP | KM_NOFS);

	if (!args)