tree 32306dcf4b2b0697d1113249c8eed3950a3a6c9d
parent ed7dc1dfbcef301407a1e3138a49dc94e5a19d0a
parent 1bf7dbfde8fe7ddaa8e2e1b4e0fc41a9fc6aa7a5
author Linus Torvalds <torvalds@linux-foundation.org> 1275748385 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1275748385 -0700

Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

* 'for-linus' of git://oss.sgi.com/xfs/xfs:
  xfs: improve xfs_isilocked
  xfs: skip writeback from reclaim context
  xfs: remove done roadmap item from xfs-delayed-logging-design.txt
  xfs: fix race in inode cluster freeing failing to stale inodes
  xfs: fix access to upper inodes without inode64
  xfs: fix might_sleep() warning when initialising per-ag tree
  fs/xfs/quota: Add missing mutex_unlock
  xfs: remove duplicated #include
  xfs: convert more trace events to DEFINE_EVENT
  xfs: xfs_trace.c: remove duplicated #include
  xfs: Check new inode size is OK before preallocating
  xfs: clean up xlog_align
  xfs: cleanup log reservation calculactions
  xfs: be more explicit if RT mount fails due to config
  xfs: replace E2BIG with EFBIG where appropriate