xfs
[Top] [All Lists]

[PATCH 2/7] ocfs2: Use generic handlers of O_SYNC AIO DIO

To: linux-fsdevel@xxxxxxxxxxxxxxx
Subject: [PATCH 2/7] ocfs2: Use generic handlers of O_SYNC AIO DIO
From: Jeff Moyer <jmoyer@xxxxxxxxxx>
Date: Thu, 29 Mar 2012 18:05:00 -0400
Cc: linux-ext4@xxxxxxxxxxxxxxx, xfs@xxxxxxxxxxx, jack@xxxxxxx, hch@xxxxxxxxxxxxx, Jeff Moyer <jmoyer@xxxxxxxxxx>
In-reply-to: <1333058705-31512-1-git-send-email-jmoyer@xxxxxxxxxx>
References: <1333058705-31512-1-git-send-email-jmoyer@xxxxxxxxxx>
From: Jan Kara <jack@xxxxxxx>

Use generic handlers to queue fsync() when AIO DIO is completed for O_SYNC
file.

Signed-off-by: Jan Kara <jack@xxxxxxx>
Signed-off-by: Jeff Moyer <jmoyer@xxxxxxxxxx>
---
 fs/ocfs2/aops.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c
index 6577432..60457cc 100644
--- a/fs/ocfs2/aops.c
+++ b/fs/ocfs2/aops.c
@@ -593,9 +593,7 @@ static void ocfs2_dio_end_io(struct kiocb *iocb,
        level = ocfs2_iocb_rw_locked_level(iocb);
        ocfs2_rw_unlock(inode, level);
 
-       if (is_async)
-               aio_complete(iocb, ret, 0);
-       inode_dio_done(inode);
+       generic_dio_end_io(iocb, offset, bytes, private, ret, is_async);
 }
 
 /*
@@ -642,7 +640,7 @@ static ssize_t ocfs2_direct_IO(int rw,
        return __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);
+                                   ocfs2_dio_end_io, NULL, DIO_SYNC_WRITES);
 }
 
 static void ocfs2_figure_cluster_boundaries(struct ocfs2_super *osb,
-- 
1.7.1

<Prev in Thread] Current Thread [Next in Thread>