tree 020842de956b7f5ce881dbcb37ce8c1a91d6654d
parent 5a0cd4eb661fea095ff9962060c21c161a9ed43f
parent 2fd6f6ec64ff347447d26646ac6188f3658b383c
author Linus Torvalds <torvalds@linux-foundation.org> 1221866519 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1221866519 -0700

Merge git://oss.sgi.com:8090/xfs/linux-2.6

* git://oss.sgi.com:8090/xfs/linux-2.6:
  [XFS] Don't do I/O beyond eof when unreserving space
  [XFS] Fix use-after-free with buffers
  [XFS] Prevent lockdep false positives when locking two inodes.
  [XFS] Fix barrier status change detection.
  [XFS] Prevent direct I/O from mapping extents beyond eof
  [XFS] Fix regression introduced by remount fixup
  [XFS] Move memory allocations for log tracing out of the critical path