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

diff --combined fs/xfs/linux-2.6/xfs_super.c
index bd07f73,af32f37..9731898
--- 1/fs/xfs/linux-2.6/xfs_super.c
--- 2/fs/xfs/linux-2.6/xfs_super.c
+++ b/fs/xfs/linux-2.6/xfs_super.c
@@@ -606,8 -606,7 +606,8 @@@ xfs_blkdev_get
  {
        int                     error = 0;
  
 -      *bdevp = open_bdev_exclusive(name, FMODE_READ|FMODE_WRITE, mp);
 +      *bdevp = blkdev_get_by_path(name, FMODE_READ|FMODE_WRITE|FMODE_EXCL,
 +                                  mp);
        if (IS_ERR(*bdevp)) {
                error = PTR_ERR(*bdevp);
                printk("XFS: Invalid device [%s], error=%d\n", name, error);
@@@ -621,7 -620,7 +621,7 @@@ xfs_blkdev_put
        struct block_device     *bdev)
  {
        if (bdev)
 -              close_bdev_exclusive(bdev, FMODE_READ|FMODE_WRITE);
 +              blkdev_put(bdev, FMODE_READ|FMODE_WRITE|FMODE_EXCL);
  }
  
  /*
@@@ -948,7 -947,7 +948,7 @@@ out_reclaim
   * Slab object creation initialisation for the XFS inode.
   * This covers only the idempotent fields in the XFS inode;
   * all other fields need to be initialised on allocation
 - * from the slab. This avoids the need to repeatedly intialise
 + * from the slab. This avoids the need to repeatedly initialise
   * fields in the xfs inode that left in the initialise state
   * when freeing the inode.
   */
@@@ -1414,7 -1413,7 +1414,7 @@@ xfs_fs_freeze
  
        xfs_save_resvblks(mp);
        xfs_quiesce_attr(mp);
-       return -xfs_fs_log_dummy(mp, SYNC_WAIT);
+       return -xfs_fs_log_dummy(mp);
  }
  
  STATIC int