Merge branch 'linus' into release

Conflicts:
	drivers/acpi/debug.c

Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 10 insertions, 6 deletions

diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c
index 356e976772bf..0de69c9a08be 100644
--- a/fs/ocfs2/aops.c
+++ b/fs/ocfs2/aops.c
@@ -578,7 +578,9 @@ bail:
 static void ocfs2_dio_end_io(struct kiocb *iocb,
                              loff_t offset,
                              ssize_t bytes,
-                             void *private)
+                             void *private,
+                             int ret,
+                             bool is_async)
 {
         struct inode *inode = iocb->ki_filp->f_path.dentry->d_inode;
         int level;
@@ -592,6 +594,9 @@ static void ocfs2_dio_end_io(struct kiocb *iocb,
         if (!level)
                 up_read(&inode->i_alloc_sem);
         ocfs2_rw_unlock(inode, level);
+
+        if (is_async)
+                aio_complete(iocb, ret, 0);
 }
 
 /*
@@ -638,11 +643,10 @@ static ssize_t ocfs2_direct_IO(int rw,
         if (i_size_read(inode) <= offset)
                 return 0;
 
-        ret = blockdev_direct_IO_no_locking(rw, iocb, inode,
-                                            inode->i_sb->s_bdev, iov, offset,
-                                            nr_segs,
-                                            ocfs2_direct_IO_get_blocks,
-                                            ocfs2_dio_end_io);
+        ret = __blockdev_direct_IO(rw, iocb, inode, inode->i_sb->s_bdev,
+                                   iov, offset, nr_segs,
+                                   ocfs2_direct_IO_get_blocks,
+                                   ocfs2_dio_end_io, NULL, 0);
 
         mlog_exit(ret);
         return ret;