From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 26 Sep 2019 18:36:20 +0000 (-0700)
Subject: Merge tag 'xfs-5.4-merge-8' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux
X-Git-Tag: v5.4-rc1~42
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2268419e4c9559ec1e80ee7ae7bd54f8976234cb;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'xfs-5.4-merge-8' of git://git./fs/xfs/xfs-linux

Pull xfs fixes from Darrick Wong:
 "There are a couple of bug fixes and some small code cleanups that came
  in recently:

   - 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"

* tag 'xfs-5.4-merge-8' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
  xfs: avoid unused to_mp() function warning
  xfs: log proper length of superblock
  xfs: revert 1baa2800e62d ("xfs: remove the unused XFS_ALLOC_USERDATA flag")
  xfs: removed unneeded variable
  xfs: convert inode to extent format after extent merge due to shift
---

2268419e4c9559ec1e80ee7ae7bd54f8976234cb