From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 6 Oct 2017 22:53:36 +0000 (-0700)
Subject: Merge tag 'xfs-4.14-fixes-4' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux
X-Git-Tag: v4.14-rc4~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=eab26ad197311ced6e95c8117a079fb9ae40697b;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'xfs-4.14-fixes-4' of git://git./fs/xfs/xfs-linux

Pull xfs fixes from Darrick Wong:

 - fix a race between overlapping copy on write aio

 - fix cow fork swapping when we defragment reflinked files

* tag 'xfs-4.14-fixes-4' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
  xfs: handle racy AIO in xfs_reflink_end_cow
  xfs: always swap the cow forks when swapping extents
---

eab26ad197311ced6e95c8117a079fb9ae40697b