From patchwork Sun Mar 6 17:14:13 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 613811 X-Patchwork-Delegate: Trond.Myklebust@netapp.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p26HEMWZ024674 for ; Sun, 6 Mar 2011 17:14:22 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752607Ab1CFROU (ORCPT ); Sun, 6 Mar 2011 12:14:20 -0500 Received: from mail-yx0-f174.google.com ([209.85.213.174]:48166 "EHLO mail-yx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750726Ab1CFROT (ORCPT ); Sun, 6 Mar 2011 12:14:19 -0500 Received: by yxs7 with SMTP id 7so1353079yxs.19 for ; Sun, 06 Mar 2011 09:14:18 -0800 (PST) Received: by 10.91.27.32 with SMTP id e32mr3778477agj.162.1299431658793; Sun, 06 Mar 2011 09:14:18 -0800 (PST) Received: from salusa.poochiereds.net (cpe-075-177-180-210.nc.res.rr.com [75.177.180.210]) by mx.google.com with ESMTPS id 17sm2496392anx.13.2011.03.06.09.14.17 (version=SSLv3 cipher=OTHER); Sun, 06 Mar 2011 09:14:17 -0800 (PST) From: Jeff Layton To: Trond Myklebust Cc: linux-nfs@vger.kernel.org Subject: [PATCH] nfs: close NFSv4 COMMIT vs. CLOSE race Date: Sun, 6 Mar 2011 12:14:13 -0500 Message-Id: <1299431653-11741-1-git-send-email-jlayton@redhat.com> X-Mailer: git-send-email 1.7.4 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Sun, 06 Mar 2011 17:14:22 +0000 (UTC) diff --git a/fs/nfs/write.c b/fs/nfs/write.c index c8278f4..42b92d7 100644 --- a/fs/nfs/write.c +++ b/fs/nfs/write.c @@ -1292,6 +1292,8 @@ static int nfs_commit_rpcsetup(struct list_head *head, task = rpc_run_task(&task_setup_data); if (IS_ERR(task)) return PTR_ERR(task); + if (how & FLUSH_SYNC) + rpc_wait_for_completion_task(task); rpc_put_task(task); return 0; }