gfs2: Remove unused RGRP_RSRV_MINBYTES definition (ad899458) · Commits · 戴 / test

This definition is only used to define RGRP_RSRV_MINBLKS, with no benefit over defining RGRP_RSRV_MINBLKS directly. In addition, instead of forcing RGRP_RSRV_MINBLKS to be of type u32, cast it to that type where that type is required. Signed-off-by:

Andreas Gruenbacher <agruenba@redhat.com> Signed-off-by:

Bob Peterson <rpeterso@redhat.com> Reviewed-by:

Steven Whitehouse <swhiteho@redhat.com>

fs/gfs2/rgrp.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1566,7 +1566,7 @@ static void rg_mblk_search(struct gfs2_rgrpd rgd, struct gfs2_inode ip,
		extlen = 1;
		else {
		extlen = max_t(u32, atomic_read(&ip->i_sizehint), ap->target);
		extlen = clamp(extlen, RGRP_RSRV_MINBLKS, free_blocks);
		extlen = clamp(extlen, (u32)RGRP_RSRV_MINBLKS, free_blocks);
		}
		if ((rgd->rd_free_clone < rgd->rd_reserved) \|\| (free_blocks < extlen))
		return;

fs/gfs2/rgrp.h

+1 −2

Original line number	Diff line number	Diff line
		@@ -18,8 +18,7 @@
		* By reserving 32 blocks at a time, we can optimize / shortcut how we search
		* through the bitmaps by looking a word at a time.
		*/
		#define RGRP_RSRV_MINBYTES 8
		#define RGRP_RSRV_MINBLKS ((u32)(RGRP_RSRV_MINBYTES * GFS2_NBBY))
		#define RGRP_RSRV_MINBLKS 32
		#define RGRP_RSRV_ADDBLKS 64

		struct gfs2_rgrpd;

Admin message