2 files changed, 5 insertions, 26 deletions

diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c
index 2f9fb421915a..977da0ec6604 100644
--- a/fs/xfs/xfs_aops.c
+++ b/fs/xfs/xfs_aops.c
@@ -86,14 +86,6 @@ xfs_destroy_ioend(
                 bh->b_end_io(bh, !ioend->io_error);
         }
 
-        if (ioend->io_iocb) {
-                inode_dio_done(ioend->io_inode);
-                if (ioend->io_isasync) {
-                        aio_complete(ioend->io_iocb, ioend->io_error ?
-                                        ioend->io_error : ioend->io_result, 0);
-                }
-        }
-
         mempool_free(ioend, xfs_ioend_pool);
 }
 
@@ -281,7 +273,6 @@ xfs_alloc_ioend(
          * all the I/O from calling the completion routine too early.
          */
         atomic_set(&ioend->io_remaining, 1);
-        ioend->io_isasync = 0;
         ioend->io_isdirect = 0;
         ioend->io_error = 0;
         ioend->io_list = NULL;
@@ -291,8 +282,6 @@ xfs_alloc_ioend(
         ioend->io_buffer_tail = NULL;
         ioend->io_offset = 0;
         ioend->io_size = 0;
-        ioend->io_iocb = NULL;
-        ioend->io_result = 0;
         ioend->io_append_trans = NULL;
 
         INIT_WORK(&ioend->io_work, xfs_end_io);
@@ -1292,8 +1281,10 @@ __xfs_get_blocks(
                 if (create || !ISUNWRITTEN(&imap))
                         xfs_map_buffer(inode, bh_result, &imap, offset);
                 if (create && ISUNWRITTEN(&imap)) {
-                        if (direct)
+                        if (direct) {
                                 bh_result->b_private = inode;
+                                set_buffer_defer_completion(bh_result);
+                        }
                         set_buffer_unwritten(bh_result);
                 }
         }
@@ -1390,9 +1381,7 @@ xfs_end_io_direct_write(
         struct kiocb            *iocb,
         loff_t                  offset,
         ssize_t                 size,
-        void                    *private,
-        int                     ret,
-        bool                    is_async)
+        void                    *private)
 {
         struct xfs_ioend        *ioend = iocb->private;
 
@@ -1414,17 +1403,10 @@ xfs_end_io_direct_write(
 
         ioend->io_offset = offset;
         ioend->io_size = size;
-        ioend->io_iocb = iocb;
-        ioend->io_result = ret;
         if (private && size > 0)
                 ioend->io_type = XFS_IO_UNWRITTEN;
 
-        if (is_async) {
-                ioend->io_isasync = 1;
-                xfs_finish_ioend(ioend);
-        } else {
-                xfs_finish_ioend_sync(ioend);
-        }
+        xfs_finish_ioend_sync(ioend);
 }
 
 STATIC ssize_t
diff --git a/fs/xfs/xfs_aops.h b/fs/xfs/xfs_aops.h
index c325abb8d61a..f94dd459dff9 100644
--- a/fs/xfs/xfs_aops.h
+++ b/fs/xfs/xfs_aops.h
@@ -45,7 +45,6 @@ typedef struct xfs_ioend {
         unsigned int            io_type;        /* delalloc / unwritten */
         int                     io_error;       /* I/O error code */
         atomic_t                io_remaining;   /* hold count */
-        unsigned int            io_isasync : 1; /* needs aio_complete */
         unsigned int            io_isdirect : 1;/* direct I/O */
         struct inode            *io_inode;      /* file being written to */
         struct buffer_head      *io_buffer_head;/* buffer linked list head */
@@ -54,8 +53,6 @@ typedef struct xfs_ioend {
         xfs_off_t               io_offset;      /* offset in the file */
         struct work_struct      io_work;        /* xfsdatad work queue */
         struct xfs_trans        *io_append_trans;/* xact. for size update */
-        struct kiocb            *io_iocb;
-        int                     io_result;
 } xfs_ioend_t;
 
 extern const struct address_space_operations xfs_address_space_operations;