[GIT PULL] xfs: fixes for 5.4-rc1

["Darrick J. Wong" <djwong@kernel.org>]

Hi Linus,

Please pull this second set of changes for 5.4-rc1.  There are a couple
of bug fixes and some small code cleanups that came in recently.

It has survived a couple of days of xfstests runs and merges cleanly
with this morning's master.  Please let me know if anything strange
happens.

--D

The following changes since commit 14e15f1bcd738dc13dd7c1e78e4800e8bc577980:

  xfs: push the grant head when the log head moves forward (2019-09-05 21:36:13 -0700)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git tags/xfs-5.4-merge-8

for you to fetch changes up to 88d32d3983e72f2a7de72a49b701e2529c48e9c1:

  xfs: avoid unused to_mp() function warning (2019-09-24 09:40:19 -0700)

----------------------------------------------------------------
Changes since last update:
- Minor code cleanups.
- Fix a superblock logging error.
- Ensure that collapse range converts the data fork to extents format
  when necessary.
- Revert the ALLOC_USERDATA cleanup because it caused subtle
  behavior regressions.

----------------------------------------------------------------
Aliasgar Surti (1):
      xfs: removed unneeded variable

Austin Kim (1):
      xfs: avoid unused to_mp() function warning

Brian Foster (1):
      xfs: convert inode to extent format after extent merge due to shift

Darrick J. Wong (1):
      xfs: revert 1baa2800e62d ("xfs: remove the unused XFS_ALLOC_USERDATA flag")

Eric Sandeen (1):
      xfs: log proper length of superblock

 fs/xfs/libxfs/xfs_alloc.h |  7 ++++---
 fs/xfs/libxfs/xfs_bmap.c  | 13 +++++++++++--
 fs/xfs/libxfs/xfs_sb.c    |  2 +-
 fs/xfs/scrub/alloc.c      |  3 +--
 fs/xfs/xfs_sysfs.c        | 13 -------------
 5 files changed, 17 insertions(+), 21 deletions(-)