Commit 48ff4045 authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

xfs: standardize GFP flags usage in online scrub 



Memory allocation usage is the same throughout online fsck -- we want
kernel memory, we have to be able to back out if we can't allocate
memory, and we don't want to spray dmesg with memory allocation failure
reports.  Standardize the GFP flag usage and document these requirements.

Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
parent b255fab0

fs/xfs/scrub/agheader.c

+1 −1
Original line number Diff line number Diff line
@@ -737,7 +737,7 @@ xchk_agfl( 
		goto out;

	}

	sai.entries = kvcalloc(sai.agflcount, sizeof(xfs_agblock_t),

			GFP_KERNEL | __GFP_RETRY_MAYFAIL);

			       XCHK_GFP_FLAGS);

	if (!sai.entries) {

		error = -ENOMEM;

		goto out;

fs/xfs/scrub/attr.c

+4 −5
Original line number Diff line number Diff line
@@ -79,7 +79,8 @@ xchk_setup_xattr( 
	 * without the inode lock held, which means we can sleep.

	 */

	if (sc->flags & XCHK_TRY_HARDER) {

		error = xchk_setup_xattr_buf(sc, XATTR_SIZE_MAX, GFP_KERNEL);

		error = xchk_setup_xattr_buf(sc, XATTR_SIZE_MAX,

				XCHK_GFP_FLAGS);

		if (error)

			return error;

	}
@@ -138,8 +139,7 @@ xchk_xattr_listent( 
	 * doesn't work, we overload the seen_enough variable to convey

	 * the error message back to the main scrub function.

	 */

	error = xchk_setup_xattr_buf(sx->sc, valuelen,

			GFP_KERNEL | __GFP_RETRY_MAYFAIL);

	error = xchk_setup_xattr_buf(sx->sc, valuelen, XCHK_GFP_FLAGS);

	if (error == -ENOMEM)

		error = -EDEADLOCK;

	if (error) {
@@ -324,8 +324,7 @@ xchk_xattr_block( 
		return 0;



	/* Allocate memory for block usage checking. */

	error = xchk_setup_xattr_buf(ds->sc, 0,

			GFP_KERNEL | __GFP_RETRY_MAYFAIL);

	error = xchk_setup_xattr_buf(ds->sc, 0, XCHK_GFP_FLAGS);

	if (error == -ENOMEM)

		return -EDEADLOCK;

	if (error)

fs/xfs/scrub/scrub.h

+9 −0
Original line number Diff line number Diff line
@@ -8,6 +8,15 @@ 


struct xfs_scrub;



/*

 * Standard flags for allocating memory within scrub.  NOFS context is

 * configured by the process allocation scope.  Scrub and repair must be able

 * to back out gracefully if there isn't enough memory.  Force-cast to avoid

 * complaints from static checkers.

 */

#define XCHK_GFP_FLAGS	((__force gfp_t)(GFP_KERNEL | __GFP_NOWARN | \

					 __GFP_RETRY_MAYFAIL))



/* Type info and names for the scrub types. */

enum xchk_type {

	ST_NONE = 1,	/* disabled */

fs/xfs/scrub/symlink.c

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ xchk_setup_symlink( 
	struct xfs_scrub	*sc)

{

	/* Allocate the buffer without the inode lock held. */

	sc->buf = kvzalloc(XFS_SYMLINK_MAXLEN + 1, GFP_KERNEL);

	sc->buf = kvzalloc(XFS_SYMLINK_MAXLEN + 1, XCHK_GFP_FLAGS);

	if (!sc->buf)

		return -ENOMEM;