tree d36da0fe62adfa3e2e46a485e0bdb06019b2e560
parent ad56cbf0fa6c09350c738ec59a3361f2e4ab4bc7
parent 73efe4a4ddf8eb2b1cc7039e8a66a23a424961af
author Linus Torvalds <torvalds@linux-foundation.org> 1295047457 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1295047457 -0800

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

* 'for-linus' of git://oss.sgi.com/xfs/xfs:
  xfs: prevent NMI timeouts in cmn_err
  xfs: Add log level to assertion printk
  xfs: fix an assignment within an ASSERT()
  xfs: fix error handling for synchronous writes
  xfs: add FITRIM support
  xfs: ensure log covering transactions are synchronous
  xfs: serialise unaligned direct IOs
  xfs: factor common write setup code
  xfs: split buffered IO write path from xfs_file_aio_write
  xfs: split direct IO write path from xfs_file_aio_write
  xfs: introduce xfs_rw_lock() helpers for locking the inode
  xfs: factor post-write newsize updates
  xfs: factor common post-write isize handling code
  xfs: ensure sync write errors are returned