1 files changed, 2 insertions, 8 deletions

diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c
index 2abf97b2a592..f37d3c0e2053 100644
--- a/fs/ocfs2/aops.c
+++ b/fs/ocfs2/aops.c
@@ -565,9 +565,7 @@ bail:
 static void ocfs2_dio_end_io(struct kiocb *iocb,
                              loff_t offset,
                              ssize_t bytes,
-                             void *private,
-                             int ret,
-                             bool is_async)
+                             void *private)
 {
         struct inode *inode = file_inode(iocb->ki_filp);
         int level;
@@ -592,10 +590,6 @@ static void ocfs2_dio_end_io(struct kiocb *iocb,
 
         level = ocfs2_iocb_rw_locked_level(iocb);
         ocfs2_rw_unlock(inode, level);
-
-        inode_dio_done(inode);
-        if (is_async)
-                aio_complete(iocb, ret, 0);
 }
 
 /*
@@ -2050,7 +2044,7 @@ int ocfs2_write_end_nolock(struct address_space *mapping,
 
 out_write_size:
         pos += copied;
-        if (pos > inode->i_size) {
+        if (pos > i_size_read(inode)) {
                 i_size_write(inode, pos);
                 mark_inode_dirty(inode);
         }