Merge tag 'assorted-fixes-5.14-1_2021-06-03' of https://git.kernel.org/pub/scm/linux...

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

diff --cc fs/xfs/libxfs/xfs_alloc.c
index 00bb34251829d43c22e167f4ad4ca983298b94e8,ae46fe64cc4fa139d1f423ead6df33f97d052b41..4c4fd77bbc4b4ed7f04157ccec001029fb2334b0
--- 1/fs/xfs/libxfs/xfs_alloc.c
--- 2/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.

diff --cc fs/xfs/libxfs/xfs_bmap.c
Simple merge