From patchwork Wed Jul 12 23:10:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9837559 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 10163603F9 for ; Wed, 12 Jul 2017 23:11:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 031A028610 for ; Wed, 12 Jul 2017 23:11:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E941828639; Wed, 12 Jul 2017 23:11:17 +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.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, 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 60EF928639 for ; Wed, 12 Jul 2017 23:11:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750846AbdGLXLP (ORCPT ); Wed, 12 Jul 2017 19:11:15 -0400 Received: from mail-it0-f65.google.com ([209.85.214.65]:33971 "EHLO mail-it0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751118AbdGLXLG (ORCPT ); Wed, 12 Jul 2017 19:11:06 -0400 Received: by mail-it0-f65.google.com with SMTP id o202so4452006itc.1 for ; Wed, 12 Jul 2017 16:11:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=BX1n9e876Z1rM5v/1yNTBL98C7jqu7s9Yto9BnwIE4Q=; b=isChHUKSViJrrvs6rOrzfuXd2cAn82LcW5bJA9mxhx/sG9NZhsDBoakpWWa1ImnLn1 A1DbK2MZsjTXfhnKhJLQskRL/cCTmizKPKw+NODwQYAYeqOq2aIsMw0ux0P6Pp2T/Kmi hnsb0wQ2Xv1RxUXYZf1CAmDkcqEqlLVJCQ5ssoKUFAxdvCesRXT2GK1385D2jQJJPIeP nj1ZPpbuoWVB5wktlkAHBm9ua3aVtogZddeMoPrpZcmTwHQWuUqyRDZU1AvWDqeAweTO 5KFBaED7RH33aAq3PbU1J2Jlae3yVkHu3lip9w8cHF/aKaNPb1da5RsFqnP4pAz2LNdN joNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=BX1n9e876Z1rM5v/1yNTBL98C7jqu7s9Yto9BnwIE4Q=; b=II2xmEd/+kK2pchZCZL3djnvWxkBDilCwp0UfC+v1K3ZejDW1Hbo8asASS6yesYeU+ NnVK/GAj2rnpqae9TZKgNSgDPUfdL5ZdaqrD/R56vlM9u1y9j6HZMD2v67+xT7CJO+hy 33cx4KsDAvyqjg+rMijL9KD4Y/8sG6Qkew0MKa3BYth3T+SqjeEtHbM69cGIPHXuR1SQ Ikt0S+erOxENN2LwvbUfjrAWBpbjvW5kiT+e1qqrjNQTISNcf3/3IRpM5TPP0lnv3cuc ebH71SwE4z5hY1V/WAKZ5ikvEjidLFqupTv4gYTWnX/9J+5vkZtGYY33TvDff/bMQU9h 3zIw== X-Gm-Message-State: AIVw1117btvwTgtIOml+Y9ijQ3svbyG8mEt/LM547buDmsnhi7J9bhbk 5TOsTSz4jUp2dQ== X-Received: by 10.36.68.193 with SMTP id o184mr10871446ita.59.1499901065573; Wed, 12 Jul 2017 16:11:05 -0700 (PDT) Received: from leira.trondhjem.org (c-68-49-162-121.hsd1.mi.comcast.net. [68.49.162.121]) by smtp.gmail.com with ESMTPSA id q81sm1989546itb.28.2017.07.12.16.11.04 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 12 Jul 2017 16:11:05 -0700 (PDT) From: Trond Myklebust To: anna.schumaker@netapp.com Cc: linux-nfs@vger.kernel.org Subject: [PATCH v2 1/4] NFS: Fix a COMMIT race in pNFS Date: Wed, 12 Jul 2017 19:10:56 -0400 Message-Id: <20170712231059.32293-2-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170712231059.32293-1-trond.myklebust@primarydata.com> References: <20170712231059.32293-1-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 We must make sure that cinfo->ds->nwritten is in sync with the commit list, since it is checked as part of pnfs_scan_commit_lists(). Signed-off-by: Trond Myklebust --- fs/nfs/pnfs_nfs.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/fs/nfs/pnfs_nfs.c b/fs/nfs/pnfs_nfs.c index d40755a0984b..3e6de85faf42 100644 --- a/fs/nfs/pnfs_nfs.c +++ b/fs/nfs/pnfs_nfs.c @@ -159,13 +159,18 @@ void pnfs_generic_recover_commit_reqs(struct list_head *dst, { struct pnfs_commit_bucket *b; struct pnfs_layout_segment *freeme; + int nwritten; int i; lockdep_assert_held(&cinfo->inode->i_lock); restart: for (i = 0, b = cinfo->ds->buckets; i < cinfo->ds->nbuckets; i++, b++) { - if (pnfs_generic_transfer_commit_list(&b->written, dst, - cinfo, 0)) { + nwritten = pnfs_generic_transfer_commit_list(&b->written, + dst, cinfo, 0); + if (!nwritten) + continue; + cinfo->ds->nwritten -= nwritten; + if (list_empty(&b->written)) { freeme = b->wlseg; b->wlseg = NULL; spin_unlock(&cinfo->inode->i_lock); @@ -174,7 +179,6 @@ void pnfs_generic_recover_commit_reqs(struct list_head *dst, goto restart; } } - cinfo->ds->nwritten = 0; } EXPORT_SYMBOL_GPL(pnfs_generic_recover_commit_reqs);