Merge branch 'master' into for-2.6.35

Conflicts:
	fs/block_dev.c

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

diff --cc drivers/block/drbd/drbd_receiver.c
Simple merge

diff --cc fs/block_dev.c
index dd769304382e558ce44bbc846ee041b62de973d8,6dcee88c2e5d275fe7df4b3e82caa52375779a74..55dcb7884f4d3824ef641b6ec5daf454e53cd1f3
--- 1/fs/block_dev.c
--- 2/fs/block_dev.c
+++ b/fs/block_dev.c
@@@ -406,17 -406,23 +406,23 @@@ static loff_t block_llseek(struct file 
   
  int blkdev_fsync(struct file *filp, struct dentry *dentry, int datasync)
  {
-       struct block_device *bdev = I_BDEV(filp->f_mapping->host);
+       struct inode *bd_inode = filp->f_mapping->host;
+       struct block_device *bdev = I_BDEV(bd_inode);
        int error;
  
-       error = sync_blockdev(bdev);
-       if (error)
-               return error;
-       
-       error = blkdev_issue_flush(bdev, GFP_KERNEL, NULL,
-                               (BLKDEV_IFL_WAIT));
+       /*
+        * There is no need to serialise calls to blkdev_issue_flush with
+        * i_mutex and doing so causes performance issues with concurrent
+        * O_SYNC writers to a block device.
+        */
+       mutex_unlock(&bd_inode->i_mutex);
+ 
 -      error = blkdev_issue_flush(bdev, NULL);
++      error = blkdev_issue_flush(bdev, GFP_KERNEL, NULL, BLKDEV_IFL_WAIT);
        if (error == -EOPNOTSUPP)
                error = 0;
+ 
+       mutex_lock(&bd_inode->i_mutex);
+ 
        return error;
  }
  EXPORT_SYMBOL(blkdev_fsync);

diff --cc include/linux/backing-dev.h
Simple merge

diff --cc include/linux/fs.h
Simple merge