Commit 10be350b authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

xfs: fix type mismatches in the inode reclaim functions 



It's currently unlikely that we will ever end up with more than 4
billion inodes waiting for reclamation, but the fs object code uses long
int for object counts and we're certainly capable of generating that
many.  Instead of truncating the internal counters, widen them and
report the object counts correctly.

Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarChandan Babu R <chandanrlinux@gmail.com>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
parent 77b4d286

fs/xfs/xfs_icache.c

+4 −4
Original line number Diff line number Diff line
@@ -1084,11 +1084,11 @@ xfs_reclaim_inodes( 
long

xfs_reclaim_inodes_nr(

	struct xfs_mount	*mp,

	int			nr_to_scan)

	unsigned long		nr_to_scan)

{

	struct xfs_icwalk	icw = {

		.icw_flags	= XFS_ICWALK_FLAG_SCAN_LIMIT,

		.icw_scan_limit	= nr_to_scan,

		.icw_scan_limit	= min_t(unsigned long, LONG_MAX, nr_to_scan),

	};



	if (xfs_want_reclaim_sick(mp))
@@ -1106,13 +1106,13 @@ xfs_reclaim_inodes_nr( 
 * Return the number of reclaimable inodes in the filesystem for

 * the shrinker to determine how much to reclaim.

 */

int

long

xfs_reclaim_inodes_count(

	struct xfs_mount	*mp)

{

	struct xfs_perag	*pag;

	xfs_agnumber_t		ag = 0;

	int			reclaimable = 0;

	long			reclaimable = 0;



	while ((pag = xfs_perag_get_tag(mp, ag, XFS_ICI_RECLAIM_TAG))) {

		ag = pag->pag_agno + 1;

fs/xfs/xfs_icache.h

+3 −3
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ struct xfs_icwalk { 
	kgid_t		icw_gid;

	prid_t		icw_prid;

	__u64		icw_min_file_size;

	int		icw_scan_limit;

	long		icw_scan_limit;

};



/* Flags that reflect xfs_fs_eofblocks functionality. */
@@ -49,8 +49,8 @@ void xfs_inode_free(struct xfs_inode *ip); 
void xfs_reclaim_worker(struct work_struct *work);



void xfs_reclaim_inodes(struct xfs_mount *mp);

int xfs_reclaim_inodes_count(struct xfs_mount *mp);

long xfs_reclaim_inodes_nr(struct xfs_mount *mp, int nr_to_scan);

long xfs_reclaim_inodes_count(struct xfs_mount *mp);

long xfs_reclaim_inodes_nr(struct xfs_mount *mp, unsigned long nr_to_scan);



void xfs_inode_mark_reclaimable(struct xfs_inode *ip);

fs/xfs/xfs_trace.h

+2 −2
Original line number Diff line number Diff line
@@ -3895,7 +3895,7 @@ DECLARE_EVENT_CLASS(xfs_icwalk_class, 
		__field(uint32_t, gid)

		__field(prid_t, prid)

		__field(__u64, min_file_size)

		__field(int, scan_limit)

		__field(long, scan_limit)

		__field(unsigned long, caller_ip)

	),

	TP_fast_assign(
@@ -3910,7 +3910,7 @@ DECLARE_EVENT_CLASS(xfs_icwalk_class, 
		__entry->scan_limit = icw ? icw->icw_scan_limit : 0;

		__entry->caller_ip = caller_ip;

	),

	TP_printk("dev %d:%d flags 0x%x uid %u gid %u prid %u minsize %llu scan_limit %d caller %pS",

	TP_printk("dev %d:%d flags 0x%x uid %u gid %u prid %u minsize %llu scan_limit %ld caller %pS",

		  MAJOR(__entry->dev), MINOR(__entry->dev),

		  __entry->flags,

		  __entry->uid,