From patchwork Thu Aug 7 02:15:03 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Tao X-Patchwork-Id: 4689011 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id CE32FC0338 for ; Thu, 7 Aug 2014 02:15:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 183822009C for ; Thu, 7 Aug 2014 02:15:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AC755200F3 for ; Thu, 7 Aug 2014 02:15:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754510AbaHGCPX (ORCPT ); Wed, 6 Aug 2014 22:15:23 -0400 Received: from mail-pd0-f176.google.com ([209.85.192.176]:52350 "EHLO mail-pd0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754420AbaHGCPX (ORCPT ); Wed, 6 Aug 2014 22:15:23 -0400 Received: by mail-pd0-f176.google.com with SMTP id y10so4289074pdj.7 for ; Wed, 06 Aug 2014 19:15:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Ichcm6ZDNbBR0oJKUdne98IhGlXiNBXPgOHyTQ3qzYY=; b=TXENkpuLe4Vg3IGhRudqBqL1xzugGCVzbBDEZl5fqyqPXVfthLyRZVRmSDSC2jc8zw ZyJhrkbOOjZMGDBXjcvdv+e/rkfnDyPUxGaUa21qzbRJ5fwU2b7/pnAcNKtqL4Ttrfgw UPU9dOZjHLmWhoM947WdFZ+vG6Mr3uF1Zhh8NlAvn1CLvaEo+pRrFNwjsVkxNDQY9Amm oAYgfe1nfiBS1PRAX9/5EJ56sJJGH/OEWubjMmtMlXaA5rUER6mvKGNxDXEHw2S492aB CBzSwJsHs/tssdVC6F1rejWfuyo1Ykx5hyRXUFhFAoFvSBj1PlGunRc/uFd+c2kt9j56 7mTQ== X-Gm-Message-State: ALoCoQmkpDmT8WTh/encTtq2EiE7r379r2WPVL/Vl0ESLULnpyDZZeWfZWCw6aJOyJBtVmGJoRVX X-Received: by 10.70.43.206 with SMTP id y14mr14759827pdl.11.1407377722633; Wed, 06 Aug 2014 19:15:22 -0700 (PDT) Received: from localhost.localdomain ([222.209.177.117]) by mx.google.com with ESMTPSA id vu7sm9159024pab.34.2014.08.06.19.15.19 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 06 Aug 2014 19:15:22 -0700 (PDT) From: Peng Tao To: Trond Myklebust Cc: linux-nfs@vger.kernel.org, Peng Tao Subject: [PATCH 2/2] nfs/filelayout: set layoutcommit depending on write verifier Date: Thu, 7 Aug 2014 10:15:03 +0800 Message-Id: <1407377703-6593-2-git-send-email-tao.peng@primarydata.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1407377703-6593-1-git-send-email-tao.peng@primarydata.com> References: <1407377703-6593-1-git-send-email-tao.peng@primarydata.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 Following http://www.rfc-editor.org/errata_search.php?rfc=5661&eid=2751 Don't set layoutcommit for commit_through_mds case. For FILE_SYNC writes, don't set layoutcommit. For DATA_SYNC wirtes, set layout commit right after wirtes done. For UNSTABLE writes, set layout commit when commit done. Signed-off-by: Peng Tao --- fs/nfs/filelayout/filelayout.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fs/nfs/filelayout/filelayout.c b/fs/nfs/filelayout/filelayout.c index 1359c4a..e8720ec 100644 --- a/fs/nfs/filelayout/filelayout.c +++ b/fs/nfs/filelayout/filelayout.c @@ -265,7 +265,7 @@ filelayout_set_layoutcommit(struct nfs_pgio_header *hdr) { if (FILELAYOUT_LSEG(hdr->lseg)->commit_through_mds || - hdr->res.verf->committed == NFS_FILE_SYNC) + hdr->res.verf->committed != NFS_DATA_SYNC) return; pnfs_set_layoutcommit(hdr); @@ -403,6 +403,9 @@ static int filelayout_commit_done_cb(struct rpc_task *task, return -EAGAIN; } + if (data->verf.committed == NFS_UNSTABLE) + pnfs_commit_set_layoutcommit(data); + return 0; }