From patchwork Wed Jun 22 20:47:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9193755 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 85BBB6075C for ; Wed, 22 Jun 2016 20:48:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 768722840B for ; Wed, 22 Jun 2016 20:48:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6B68928416; Wed, 22 Jun 2016 20:48:32 +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 5D8E828415 for ; Wed, 22 Jun 2016 20:48:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751315AbcFVUsa (ORCPT ); Wed, 22 Jun 2016 16:48:30 -0400 Received: from mail-it0-f67.google.com ([209.85.214.67]:35971 "EHLO mail-it0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752187AbcFVUs3 (ORCPT ); Wed, 22 Jun 2016 16:48:29 -0400 Received: by mail-it0-f67.google.com with SMTP id h190so8968600ith.3 for ; Wed, 22 Jun 2016 13:48:29 -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=kERtHE6W7MtktfFuFlwX+ac0Gbxftlf3iT6jhln4JN4fzIf8oLe5tSmSkuL+58rh7P eMtfvBXeKpJr+IQ8IpGyIB9VnvjN19+6mQJE8Lj5A8l+6YZtwyZNrzxaCBbpokY1d9kZ zHBUVYP6bbSvuy4vujguEJUX+OPi/B6jSUXs0ZAEgpqEkFeNdZeuiALW30QI/FsSks3M HxdsCf53smI8JaikCkYhNigeAxLpTuSypYaH65Ai8XgqvODOQtl2k3HKPZl+2Xm5XYeE fbtKyS0x6EVo+YRaEaghnO+g2AtqxI1p0AKjIu8AY7dQoghXorvP4hTfeQUThzg7UlAS GPgQ== 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=Mcf8TkK+/DEhQRri0rQoaM/DMRJuztKqwjiZwV5Cq8+bUpOA31sCHg404X052EnsuM Jo+4Fiak8jZD9DzOlGLH2bQFxgyZFyKFPtzlhZLM+ubhflJYbnUx/ktJg8iG/yGqlPIk 8xSE7sl/MXzPNTtE9jNt/3WTLmQJ7Sqbqzgd5MI8ajnwt0TueY2yMG0FYv06Q6KbdY0M i+vu1IOFHVbAabQosRnZd8PnLukCBpiRTFB0QSDKgxAfk/G/VhyQc2LGBnZmeC86vqVU /okyVR7fvZTSdv8Lu+8h7kusOo5qQLkL/VfDKSZR6JSBc9sTTwCywu+1AFUaHyNPXRyK SnVg== X-Gm-Message-State: ALyK8tLqpv1odUQbjbr1IQ1H4E1jPcE6HJmNmZVjinrEGXkeU8sqvEhGLXPSbMwPniOl9g== X-Received: by 10.36.47.76 with SMTP id j73mr17438917itj.82.1466628508743; Wed, 22 Jun 2016 13:48:28 -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 m133sm1061586ioa.23.2016.06.22.13.48.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Jun 2016 13:48:28 -0700 (PDT) From: Trond Myklebust To: linux-nfs@vger.kernel.org Subject: [PATCH v3 09/13] NFS: Ensure we reset the write verifier 'committed' value on resend. Date: Wed, 22 Jun 2016 16:47:44 -0400 Message-Id: <1466628468-3958-9-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1466628468-3958-8-git-send-email-trond.myklebust@primarydata.com> References: <1466628468-3958-1-git-send-email-trond.myklebust@primarydata.com> <1466628468-3958-2-git-send-email-trond.myklebust@primarydata.com> <1466628468-3958-3-git-send-email-trond.myklebust@primarydata.com> <1466628468-3958-4-git-send-email-trond.myklebust@primarydata.com> <1466628468-3958-5-git-send-email-trond.myklebust@primarydata.com> <1466628468-3958-6-git-send-email-trond.myklebust@primarydata.com> <1466628468-3958-7-git-send-email-trond.myklebust@primarydata.com> <1466628468-3958-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);