From patchwork Sat Feb 28 04:16:17 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 5904741 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 2A2EF9F37F for ; Sat, 28 Feb 2015 04:16:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 41069202E9 for ; Sat, 28 Feb 2015 04:16:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2600D202E6 for ; Sat, 28 Feb 2015 04:16:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751232AbbB1EQV (ORCPT ); Fri, 27 Feb 2015 23:16:21 -0500 Received: from mail-ig0-f174.google.com ([209.85.213.174]:44750 "EHLO mail-ig0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751111AbbB1EQU (ORCPT ); Fri, 27 Feb 2015 23:16:20 -0500 Received: by igdh15 with SMTP id h15so5530040igd.3 for ; Fri, 27 Feb 2015 20:16:20 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id; bh=YmUIAxvenNEfQfjW2RTYuXlW1wHHqw/2mwzxE8SZpO8=; b=TO/AYKRs4X0LGIFy8LO1TMDiyEnA2WwfYqv+6YfcfdCY4D4T4qzgDwN1wC28hqLoQF Gy8IDaWNdKNiIMIq9BfA01TLX8RNPvL6ax/J1d4tnXerMgMlVk6tqQL78HFoWaGJgX6J xdg5xaRTvnKopyTzZaoJz9/GIJiQz0t2rquuJLpOe0cpy41Hlxn2xzxoQrX0Ohabq55E UDhnkUJdbD5GyBgoVjtXXFxR92rqOr0WvlPJUU1rZ/XlZhmBrIwtU8l1x0hpWNTrFOb3 /jsn1SzCp3RAj/29+na6bZ9oQI9bR0dDZEOKV+vCdYheaRxFJaKkdw4DUFZR+MaeAnli PZHA== X-Gm-Message-State: ALoCoQkgxofSVQq1f11ZFkeTAzgAEoQbbory/0klp9cKiET5kgrGGWAMJTSGu4rP8BctmVV089tB X-Received: by 10.50.43.138 with SMTP id w10mr7494950igl.19.1425096980025; Fri, 27 Feb 2015 20:16:20 -0800 (PST) Received: from leira.trondhjem.org.localdomain ([50.127.253.141]) by mx.google.com with ESMTPSA id v15sm2575596igd.15.2015.02.27.20.16.18 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 27 Feb 2015 20:16:19 -0800 (PST) From: Trond Myklebust To: linux-nfs@vger.kernel.org Subject: [PATCH] NFS: Ensure that buffered writes wait for O_DIRECT writes to complete Date: Fri, 27 Feb 2015 23:16:17 -0500 Message-Id: <1425096977-9293-1-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The O_DIRECT code will grab the inode->i_mutex and flush out buffered writes, before scheduling a read or a write. However there is no equivalent in the buffered write code to wait for O_DIRECT to complete. Fixes a reported issue in xfstests generic/133, when first performing an O_DIRECT write followed by a buffered write. Signed-off-by: Trond Myklebust --- fs/nfs/file.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fs/nfs/file.c b/fs/nfs/file.c index 94712fc781fa..c045c7169fa0 100644 --- a/fs/nfs/file.c +++ b/fs/nfs/file.c @@ -372,6 +372,10 @@ start: nfs_wait_bit_killable, TASK_KILLABLE); if (ret) return ret; + /* + * Wait for O_DIRECT to complete + */ + nfs_inode_dio_wait(mapping->host); page = grab_cache_page_write_begin(mapping, index, flags); if (!page)