From patchwork Mon Oct 14 08:26:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kara X-Patchwork-Id: 11188033 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4F80014DB for ; Mon, 14 Oct 2019 08:26:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 39E6A2168B for ; Mon, 14 Oct 2019 08:26:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730381AbfJNI0N (ORCPT ); Mon, 14 Oct 2019 04:26:13 -0400 Received: from mx2.suse.de ([195.135.220.15]:60204 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1730350AbfJNI0M (ORCPT ); Mon, 14 Oct 2019 04:26:12 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 2CBB3B43E; Mon, 14 Oct 2019 08:26:11 +0000 (UTC) Received: by quack2.suse.cz (Postfix, from userid 1000) id B713F1E4A88; Mon, 14 Oct 2019 10:26:10 +0200 (CEST) From: Jan Kara To: Cc: Christoph Hellwig , darrick.wong@oracle.com, , Matthew Bobrowski , Dave Chinner , Jan Kara Subject: [PATCH 2/2] xfs: Use iomap_dio_rw_wait() Date: Mon, 14 Oct 2019 10:26:03 +0200 Message-Id: <20191014082610.6298-2-jack@suse.cz> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20191014082418.13885-1-jack@suse.cz> References: <20191014082418.13885-1-jack@suse.cz> Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org Use iomap_dio_rw() to wait for unaligned direct IO instead of opencoding the wait. Signed-off-by: Jan Kara Reviewed-by: Christoph Hellwig --- fs/xfs/xfs_file.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c index 0739ba72a82e..c0620135a279 100644 --- a/fs/xfs/xfs_file.c +++ b/fs/xfs/xfs_file.c @@ -547,16 +547,12 @@ xfs_file_dio_aio_write( } trace_xfs_file_direct_write(ip, count, iocb->ki_pos); - ret = iomap_dio_rw(iocb, from, &xfs_iomap_ops, &xfs_dio_write_ops, - is_sync_kiocb(iocb)); - /* - * If unaligned, this is the only IO in-flight. If it has not yet - * completed, wait on it before we release the iolock to prevent - * subsequent overlapping IO. + * If unaligned, this is the only IO in-flight. Wait on it before we + * release the iolock to prevent subsequent overlapping IO. */ - if (ret == -EIOCBQUEUED && unaligned_io) - inode_dio_wait(inode); + ret = iomap_dio_rw(iocb, from, &xfs_iomap_ops, &xfs_dio_write_ops, + is_sync_kiocb(iocb) || unaligned_io); out: xfs_iunlock(ip, iolock);