From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff Moyer Subject: [PATCH 2/7] ocfs2: Use generic handlers of O_SYNC AIO DIO Date: Thu, 29 Mar 2012 18:05:00 -0400 Message-ID: <1333058705-31512-3-git-send-email-jmoyer@redhat.com> References: <1333058705-31512-1-git-send-email-jmoyer@redhat.com> Cc: linux-ext4@vger.kernel.org, xfs@oss.sgi.com, jack@suse.cz, hch@infradead.org, Jeff Moyer To: linux-fsdevel@vger.kernel.org Return-path: Received: from mx1.redhat.com ([209.132.183.28]:21925 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758382Ab2C2WFk (ORCPT ); Thu, 29 Mar 2012 18:05:40 -0400 In-Reply-To: <1333058705-31512-1-git-send-email-jmoyer@redhat.com> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: From: Jan Kara Use generic handlers to queue fsync() when AIO DIO is completed for O_SYNC file. Signed-off-by: Jan Kara Signed-off-by: Jeff Moyer --- 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