From patchwork Tue May 2 16:41:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9708343 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 4CA5460245 for ; Tue, 2 May 2017 16:41:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 40A5A27F9A for ; Tue, 2 May 2017 16:41:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3588D2846A; Tue, 2 May 2017 16:41:13 +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 D5BFB27F9A for ; Tue, 2 May 2017 16:41:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751151AbdEBQlM (ORCPT ); Tue, 2 May 2017 12:41:12 -0400 Received: from mail-it0-f67.google.com ([209.85.214.67]:33501 "EHLO mail-it0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751134AbdEBQlL (ORCPT ); Tue, 2 May 2017 12:41:11 -0400 Received: by mail-it0-f67.google.com with SMTP id v135so3039083itv.0 for ; Tue, 02 May 2017 09:41:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=nMghReVlrEzNEGW1NqZWixSAXX8Ujf+GhgXppYZvPhg=; b=Mn7/IncR3880t0DuP/uvohHt5/5O/69X1IWq4TNYCr4G2OkT8KOw10fZOc0IT4ZzDm xaPWSN7MT5xJsX04yRqhoOn2127BcmD3WFSlzY63drxgySZxmXE65z5mucH8++jLxBuw XJM7CfwvN65u7iLMpRo6Zs4DA8vjTKLmUvDVtwbTzPrr8D/wNAooGTs8C3OtRQFQUZPy uzbA0qUFZaFOhaNXYlgzfDq39vWBEm7EYG3yYr/QwZIfN9zX+G7q4/mTPK/j1pFHWD3i PRDHMZbhtl4dNXKxSbm7xfvbQEaSAO7sz54YlFjG902y2x4kOkqdDnp8cdDhqBB11fXk 7Wuw== 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:subject:date:message-id :in-reply-to:references; bh=nMghReVlrEzNEGW1NqZWixSAXX8Ujf+GhgXppYZvPhg=; b=FrTwp7AJAxKGeqUmlbEfKXTBmkBtSF3YYBQh1DhdV1aRFVGeyBFHi8nkhEWe7b08C5 qAqEl5UY/4v3bWv3DoIoLezX0kqd87TtItiWrrhbkdQmpdrM1XTihcUDOYa+KJQEBjZ1 CjsOuPZ1EQzbSgxwfVBykajq2RoWgZ0jzHp6PVEk4Y2/D7656iwbjp2nghWnnn/YapkN 06Zv14Z9DQXg8zpw+e6gClidJzuADdcXuicoR+rtTDG/+vNnXBb78x5Aedc9+IkwOqaV y/6PNaqrQ+rFzSvluAKhtw8ScHjuQnSXbTqnWjBDgGrUmH/S/8ZzZ1Doo2btJyTaZ09u lO+Q== X-Gm-Message-State: AN3rC/6NMO1M3MR5qmJWCJZTEHDAzVVFOPtSuPjqxKUQKH/FOupsFnOZ /My17GSLTHbRcg== X-Received: by 10.36.81.145 with SMTP id s139mr4647397ita.101.1493743270239; Tue, 02 May 2017 09:41:10 -0700 (PDT) Received: from localhost.localdomain (c-68-49-162-121.hsd1.mi.comcast.net. [68.49.162.121]) by smtp.gmail.com with ESMTPSA id m41sm1900iti.0.2017.05.02.09.41.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 May 2017 09:41:09 -0700 (PDT) From: Trond Myklebust To: linux-nfs@vger.kernel.org Subject: [PATCH 3/3] pNFS: Fix a typo in pnfs_generic_alloc_ds_commits Date: Tue, 2 May 2017 12:41:05 -0400 Message-Id: <20170502164105.6373-4-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170502164105.6373-3-trond.myklebust@primarydata.com> References: <20170502164105.6373-1-trond.myklebust@primarydata.com> <20170502164105.6373-2-trond.myklebust@primarydata.com> <20170502164105.6373-3-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 If the layout segment is invalid, we want to just resend the remaining writes. Signed-off-by: Trond Myklebust --- fs/nfs/pnfs_nfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/nfs/pnfs_nfs.c b/fs/nfs/pnfs_nfs.c index 7697ac0ff81a..ae600ab1a646 100644 --- a/fs/nfs/pnfs_nfs.c +++ b/fs/nfs/pnfs_nfs.c @@ -223,7 +223,7 @@ pnfs_generic_alloc_ds_commits(struct nfs_commit_info *cinfo, */ if (!pnfs_is_valid_lseg(bucket->clseg) && !test_bit(NFS_LSEG_LAYOUTRETURN, &bucket->clseg->pls_flags)) - continue; + break; data = nfs_commitdata_alloc(false); if (!data) break;