From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 18 Apr 2014 17:17:37 +0000 (-0700)
Subject: Merge tag 'xfs-for-linus-3.15-rc2' of git://oss.sgi.com/xfs/xfs
X-Git-Tag: firefly_0821_release~176^2~4034
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=962bf3eadfb62d1d15df59e43499ef82036ea878;p=firefly-linux-kernel-4.4.55.git

Merge tag 'xfs-for-linus-3.15-rc2' of git://oss.sgi.com/xfs/xfs

Pull xfs bug fixes from Dave Chinner:
 "The fixes are for data corruption issues, memory corruption and
  regressions for changes merged in -rc1.

  Data corruption fixes:
   - fix a bunch of delayed allocation state mismatches
   - fix collapse/zero range bugs
   - fix a direct IO block mapping bug @ EOF

  Other fixes:
   - fix a use after free on metadata IO error
   - fix a use after free on IO error during unmount
   - fix an incorrect error sign on direct IO write errors
   - add missing O_TMPFILE inode security context initialisation"

* tag 'xfs-for-linus-3.15-rc2' of git://oss.sgi.com/xfs/xfs:
  xfs: fix tmpfile/selinux deadlock and initialize security
  xfs: fix buffer use after free on IO error
  xfs: wrong error sign conversion during failed DIO writes
  xfs: unmount does not wait for shutdown during unmount
  xfs: collapse range is delalloc challenged
  xfs: don't map ranges that span EOF for direct IO
  xfs: zeroing space needs to punch delalloc blocks
  xfs: xfs_vm_write_end truncates too much on failure
  xfs: write failure beyond EOF truncates too much data
  xfs: kill buffers over failed write ranges properly
---

962bf3eadfb62d1d15df59e43499ef82036ea878