Commit 707e0dda authored by Tetsuo Handa's avatar Tetsuo Handa Committed by Darrick J. Wong
Browse files

fs: xfs: Remove KM_NOSLEEP and KM_SLEEP. 



Since no caller is using KM_NOSLEEP and no callee branches on KM_SLEEP,
we can remove KM_NOSLEEP and replace KM_SLEEP with 0.

Signed-off-by: default avatarTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent a55aa89a

fs/xfs/kmem.c

+3 −3
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ kmem_alloc(size_t size, xfs_km_flags_t flags) 


	do {

		ptr = kmalloc(size, lflags);

		if (ptr || (flags & (KM_MAYFAIL|KM_NOSLEEP)))

		if (ptr || (flags & KM_MAYFAIL))

			return ptr;

		if (!(++retries % 100))

			xfs_err(NULL,
@@ -67,7 +67,7 @@ kmem_realloc(const void *old, size_t newsize, xfs_km_flags_t flags) 


	do {

		ptr = krealloc(old, newsize, lflags);

		if (ptr || (flags & (KM_MAYFAIL|KM_NOSLEEP)))

		if (ptr || (flags & KM_MAYFAIL))

			return ptr;

		if (!(++retries % 100))

			xfs_err(NULL,
@@ -87,7 +87,7 @@ kmem_zone_alloc(kmem_zone_t *zone, xfs_km_flags_t flags) 


	do {

		ptr = kmem_cache_alloc(zone, lflags);

		if (ptr || (flags & (KM_MAYFAIL|KM_NOSLEEP)))

		if (ptr || (flags & KM_MAYFAIL))

			return ptr;

		if (!(++retries % 100))

			xfs_err(NULL,

fs/xfs/kmem.h

+4 −10
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 
 */



typedef unsigned __bitwise xfs_km_flags_t;

#define KM_SLEEP	((__force xfs_km_flags_t)0x0001u)

#define KM_NOSLEEP	((__force xfs_km_flags_t)0x0002u)

#define KM_NOFS		((__force xfs_km_flags_t)0x0004u)

#define KM_MAYFAIL	((__force xfs_km_flags_t)0x0008u)

#define KM_ZERO		((__force xfs_km_flags_t)0x0010u)
@@ -32,15 +30,11 @@ kmem_flags_convert(xfs_km_flags_t flags) 
{

	gfp_t	lflags;



	BUG_ON(flags & ~(KM_SLEEP|KM_NOSLEEP|KM_NOFS|KM_MAYFAIL|KM_ZERO));

	BUG_ON(flags & ~(KM_NOFS|KM_MAYFAIL|KM_ZERO));



	if (flags & KM_NOSLEEP) {

		lflags = GFP_ATOMIC | __GFP_NOWARN;

	} else {

	lflags = GFP_KERNEL | __GFP_NOWARN;

	if (flags & KM_NOFS)

		lflags &= ~__GFP_FS;

	}



	/*

	 * Default page/slab allocator behavior is to retry for ever

fs/xfs/libxfs/xfs_alloc.c

+1 −1
Original line number Diff line number Diff line
@@ -2205,7 +2205,7 @@ xfs_defer_agfl_block( 
	ASSERT(xfs_bmap_free_item_zone != NULL);

	ASSERT(oinfo != NULL);



	new = kmem_zone_alloc(xfs_bmap_free_item_zone, KM_SLEEP);

	new = kmem_zone_alloc(xfs_bmap_free_item_zone, 0);

	new->xefi_startblock = XFS_AGB_TO_FSB(mp, agno, agbno);

	new->xefi_blockcount = 1;

	new->xefi_oinfo = *oinfo;

fs/xfs/libxfs/xfs_attr_leaf.c

+4 −4
Original line number Diff line number Diff line
@@ -782,7 +782,7 @@ xfs_attr_shortform_to_leaf( 
	ifp = dp->i_afp;

	sf = (xfs_attr_shortform_t *)ifp->if_u1.if_data;

	size = be16_to_cpu(sf->hdr.totsize);

	tmpbuffer = kmem_alloc(size, KM_SLEEP);

	tmpbuffer = kmem_alloc(size, 0);

	ASSERT(tmpbuffer != NULL);

	memcpy(tmpbuffer, ifp->if_u1.if_data, size);

	sf = (xfs_attr_shortform_t *)tmpbuffer;
@@ -985,7 +985,7 @@ xfs_attr3_leaf_to_shortform( 


	trace_xfs_attr_leaf_to_sf(args);



	tmpbuffer = kmem_alloc(args->geo->blksize, KM_SLEEP);

	tmpbuffer = kmem_alloc(args->geo->blksize, 0);

	if (!tmpbuffer)

		return -ENOMEM;
@@ -1448,7 +1448,7 @@ xfs_attr3_leaf_compact( 


	trace_xfs_attr_leaf_compact(args);



	tmpbuffer = kmem_alloc(args->geo->blksize, KM_SLEEP);

	tmpbuffer = kmem_alloc(args->geo->blksize, 0);

	memcpy(tmpbuffer, bp->b_addr, args->geo->blksize);

	memset(bp->b_addr, 0, args->geo->blksize);

	leaf_src = (xfs_attr_leafblock_t *)tmpbuffer;
@@ -2167,7 +2167,7 @@ xfs_attr3_leaf_unbalance( 
		struct xfs_attr_leafblock *tmp_leaf;

		struct xfs_attr3_icleaf_hdr tmphdr;



		tmp_leaf = kmem_zalloc(state->args->geo->blksize, KM_SLEEP);

		tmp_leaf = kmem_zalloc(state->args->geo->blksize, 0);



		/*

		 * Copy the header into the temp leaf so that all the stuff

fs/xfs/libxfs/xfs_bmap.c

+3 −3
Original line number Diff line number Diff line
@@ -553,7 +553,7 @@ __xfs_bmap_add_free( 
#endif

	ASSERT(xfs_bmap_free_item_zone != NULL);



	new = kmem_zone_alloc(xfs_bmap_free_item_zone, KM_SLEEP);

	new = kmem_zone_alloc(xfs_bmap_free_item_zone, 0);

	new->xefi_startblock = bno;

	new->xefi_blockcount = (xfs_extlen_t)len;

	if (oinfo)
@@ -1099,7 +1099,7 @@ xfs_bmap_add_attrfork( 
	if (error)

		goto trans_cancel;

	ASSERT(ip->i_afp == NULL);

	ip->i_afp = kmem_zone_zalloc(xfs_ifork_zone, KM_SLEEP);

	ip->i_afp = kmem_zone_zalloc(xfs_ifork_zone, 0);

	ip->i_afp->if_flags = XFS_IFEXTENTS;

	logflags = 0;

	switch (ip->i_d.di_format) {
@@ -6094,7 +6094,7 @@ __xfs_bmap_add( 
			bmap->br_blockcount,

			bmap->br_state);



	bi = kmem_alloc(sizeof(struct xfs_bmap_intent), KM_SLEEP | KM_NOFS);

	bi = kmem_alloc(sizeof(struct xfs_bmap_intent), KM_NOFS);

	INIT_LIST_HEAD(&bi->bi_list);

	bi->bi_type = type;

	bi->bi_owner = ip;

CRA Git | Maintained and supported by SUSTech CRA and CCSE