From patchwork Thu Jun 23 20:00:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9195943 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 16CA06075A for ; Thu, 23 Jun 2016 20:01:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 08B781FEC1 for ; Thu, 23 Jun 2016 20:01:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F1E8328463; Thu, 23 Jun 2016 20:01:30 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A18F91FEC1 for ; Thu, 23 Jun 2016 20:01:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751831AbcFWUB3 (ORCPT ); Thu, 23 Jun 2016 16:01:29 -0400 Received: from mail-it0-f66.google.com ([209.85.214.66]:35296 "EHLO mail-it0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751587AbcFWUB2 (ORCPT ); Thu, 23 Jun 2016 16:01:28 -0400 Received: by mail-it0-f66.google.com with SMTP id g127so12803278ith.2 for ; Thu, 23 Jun 2016 13:01:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=PVr8dYkhoUqf4bIfS3D1C2tyepSjsHQLDNsd0mp51Rs=; b=Nalk4I3GPysmG/m2mgn9u3MOWM2oxZCZNjmLsJyHm43uOcbKjV4Y8SE/78bg1py1WJ gmmAoZiigEBDaWFaY9XzhRE60GfL9+YRd+SPLF7j342SHwdNQrXXMsNR7o45Kr1DnLrG JMiL3VQIx58XW1gB5cn0KMxRe+3EtYxm0TLpXruR9vDz2vqVYnnA5Av9520gdpcgTiRO zH6mIoUl1kCc8n/4z0d9BdLwXbiWPQRg+3EkdkcGiZzzPOeadzk2av/iVqehuRtIOoMk oEkPGJ/DvlYe1OL/1RYmqiirA3iTNIJBAjiEILbv0hSgcprJFwbI6ZdGJPWcHKNx4BoR f/ww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=PVr8dYkhoUqf4bIfS3D1C2tyepSjsHQLDNsd0mp51Rs=; b=RL+gP7B8jDbD1QXILdwQjfOz8+alBfXIvucpTm9AlBLWyk9iYxGjGnZ5R9LmYaCeJH TZp+CibiGs1pZfFPBp26R8heFJD6PGzAIzfTI4nJo2SXh0wQ1ThlOy/HuUun9H4mIyi7 bfDO2QTVTZRLZfeBv6g0OAl4/r+5zafsTWbc6At3q2q+Qrl6U1NdS5bYG4RSkG6CoGLD a6mUJSelUazFvMQdiP5k8k56WnXG+7Ajh1DxAimyNUAUb9Ro519PXL5t6S3vUMZtZpcy FW6HtuYNX/gsAGmjAoQWuDsjJLodh0i8LkfzlE7humcgf/qgh4Ki3HNP70I2yBnCJo7b /QgA== X-Gm-Message-State: ALyK8tI9uOjCtB1KsTDD4VI7eTjVqmtHE5Hm8XpA9xFz31aeGalrQiy1Jclf+FfLGuY94Q== X-Received: by 10.36.31.213 with SMTP id d204mr2561242itd.74.1466712087779; Thu, 23 Jun 2016 13:01:27 -0700 (PDT) Received: from leira.trondhjem.org.localdomain (c-68-49-162-121.hsd1.mi.comcast.net. [68.49.162.121]) by smtp.gmail.com with ESMTPSA id c130sm1053946ioe.42.2016.06.23.13.01.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 Jun 2016 13:01:27 -0700 (PDT) From: Trond Myklebust To: linux-nfs@vger.kernel.org Subject: [PATCH v4 09/17] NFS: Ensure we reset the write verifier 'committed' value on resend. Date: Thu, 23 Jun 2016 16:00:41 -0400 Message-Id: <1466712049-5326-9-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1466712049-5326-8-git-send-email-trond.myklebust@primarydata.com> References: <1466712049-5326-1-git-send-email-trond.myklebust@primarydata.com> <1466712049-5326-2-git-send-email-trond.myklebust@primarydata.com> <1466712049-5326-3-git-send-email-trond.myklebust@primarydata.com> <1466712049-5326-4-git-send-email-trond.myklebust@primarydata.com> <1466712049-5326-5-git-send-email-trond.myklebust@primarydata.com> <1466712049-5326-6-git-send-email-trond.myklebust@primarydata.com> <1466712049-5326-7-git-send-email-trond.myklebust@primarydata.com> <1466712049-5326-8-git-send-email-trond.myklebust@primarydata.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Trond Myklebust --- fs/nfs/direct.c | 2 ++ fs/nfs/internal.h | 17 +++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c index d6d43b5eafb3..fb659bb50678 100644 --- a/fs/nfs/direct.c +++ b/fs/nfs/direct.c @@ -661,6 +661,8 @@ static void nfs_direct_write_reschedule(struct nfs_direct_req *dreq) nfs_direct_write_scan_commit_list(dreq->inode, &reqs, &cinfo); dreq->count = 0; + dreq->verf.committed = NFS_INVALID_STABLE_HOW; + nfs_clear_pnfs_ds_commit_verifiers(&dreq->ds_cinfo); for (i = 0; i < dreq->mirror_count; i++) dreq->mirrors[i].count = 0; get_dreq(dreq); diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h index 150a8eb0f323..0eb5c924886d 100644 --- a/fs/nfs/internal.h +++ b/fs/nfs/internal.h @@ -499,6 +499,23 @@ int nfs_key_timeout_notify(struct file *filp, struct inode *inode); bool nfs_ctx_key_to_expire(struct nfs_open_context *ctx); void nfs_pageio_stop_mirroring(struct nfs_pageio_descriptor *pgio); +#ifdef CONFIG_NFS_V4_1 +static inline +void nfs_clear_pnfs_ds_commit_verifiers(struct pnfs_ds_commit_info *cinfo) +{ + int i; + + for (i = 0; i < cinfo->nbuckets; i++) + cinfo->buckets[i].direct_verf.committed = NFS_INVALID_STABLE_HOW; +} +#else +static inline +void nfs_clear_pnfs_ds_commit_verifiers(struct pnfs_ds_commit_info *cinfo) +{ +} +#endif + + #ifdef CONFIG_MIGRATION extern int nfs_migrate_page(struct address_space *, struct page *, struct page *, enum migrate_mode);