From: Darrick J. Wong <djwong@kernel.org>
Date: Tue, 8 Jun 2021 16:22:34 +0000 (-0700)
Subject: Merge tag 'assorted-fixes-5.14-1_2021-06-03' of https://git.kernel.org/pub/scm/linux... 
X-Git-Tag: accepted/tizen/unified/20230118.172025~6920^2~32
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8b943d21d40d5d7f8306e833b156f8d11094470f;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'assorted-fixes-5.14-1_2021-06-03' of https://git./linux/kernel/git/djwong/xfs-linux into xfs-5.14-merge2

xfs: assorted fixes for 5.14, part 1

This branch contains the first round of various small fixes for 5.14.

* tag 'assorted-fixes-5.14-1_2021-06-03' of https://git.kernel.org/pub/scm/linux/kernel/git/djwong/xfs-linux:
  xfs: don't take a spinlock unconditionally in the DIO fastpath
  xfs: mark xfs_bmap_set_attrforkoff static
  xfs: Remove redundant assignment to busy
  xfs: sort variable alphabetically to avoid repeated declaration
---

8b943d21d40d5d7f8306e833b156f8d11094470f
diff --cc fs/xfs/libxfs/xfs_alloc.c
index 00bb342,ae46fe6..4c4fd77
--- a/fs/xfs/libxfs/xfs_alloc.c
+++ b/fs/xfs/libxfs/xfs_alloc.c
@@@ -1674,9 -1674,8 +1674,8 @@@ restart
  	 * Allocate and initialize a cursor for the by-size btree.
  	 */
  	cnt_cur = xfs_allocbt_init_cursor(args->mp, args->tp, args->agbp,
 -		args->agno, XFS_BTNUM_CNT);
 +					args->pag, XFS_BTNUM_CNT);
  	bno_cur = NULL;
- 	busy = false;
  
  	/*
  	 * Look for an entry >= maxlen+alignment-1 blocks.