From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 28 Sep 2013 20:52:05 +0000 (-0700)
Subject: Merge tag 'xfs-for-linus-v3.12-rc3' of git://oss.sgi.com/xfs/xfs
X-Git-Tag: v3.12-rc3~10
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ddd23eb1829988cc1ebc58a2f622c56c508e219e;p=kernel%2Fkernel-generic.git

Merge tag 'xfs-for-linus-v3.12-rc3' of git://oss.sgi.com/xfs/xfs

Pull xfs bugfixes from Ben Myers:
 - fix for directory node collapse regression
 - fix for recovery over stale on disk structures
 - fix for eofblocks ioctl
 - fix asserts in xfs_inode_free
 - lock the ail before removing an item from it

* tag 'xfs-for-linus-v3.12-rc3' of git://oss.sgi.com/xfs/xfs:
  xfs: fix node forward in xfs_node_toosmall
  xfs: log recovery lsn ordering needs uuid check
  xfs: fix XFS_IOC_FREE_EOFBLOCKS definition
  xfs: asserting lock not held during freeing not valid
  xfs: lock the AIL before removing the buffer item
---

ddd23eb1829988cc1ebc58a2f622c56c508e219e