Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 2 May 2009 23:52:50 +0000 (16:52 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 2 May 2009 23:52:50 +0000 (16:52 -0700)
commitb4348f32dae3cb6eb4bc21c7ed8f76c0b11e9d6a
treed796a497a6dd2d51e67f4f8e0cc73a31992cf910
parent9fffb55f66127b52c937ede5196ebfa0c0d50bce
parent28e211700a81b0a934b6c7a4b8e7dda843634d2f
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

* 'for-linus' of git://oss.sgi.com/xfs/xfs:
  xfs: fix getbmap vs mmap deadlock
  xfs: a couple getbmap cleanups
  xfs: add more checks to superblock validation
  xfs_file_last_byte() needs to acquire ilock