From patchwork Tue May 2 16:38:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9708323 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 B26AB6021C for ; Tue, 2 May 2017 16:38:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A5BF127F9A for ; Tue, 2 May 2017 16:38:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9ADD0284DA; Tue, 2 May 2017 16:38:24 +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 9387027F9A for ; Tue, 2 May 2017 16:38:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751156AbdEBQiW (ORCPT ); Tue, 2 May 2017 12:38:22 -0400 Received: from mail-io0-f196.google.com ([209.85.223.196]:35587 "EHLO mail-io0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750854AbdEBQiV (ORCPT ); Tue, 2 May 2017 12:38:21 -0400 Received: by mail-io0-f196.google.com with SMTP id d203so31589806iof.2 for ; Tue, 02 May 2017 09:38:21 -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=V+DFx4DraqCz9xcWcJ1tgsHGKLcA9P0bmKUqXLHHBMQ1wRQQ69IN/aA/hPNMaALzLg twYUpiH35YR36rYp5+CPc7/QIA4Mp55d/9ldhW/wfTFNTfrSwskRRXxIE7CzMMzpIDI9 kojPSRqn8EW+OS3tkpCEpf211Nx5zOPYEe4jIxFmE/6K5ENn2PW7y0uEqHCT/Xv34ue7 13IAbE5MSjnscFx+uvFO24HTZlHQaFq/vwYUKQ33cBpuuGdv382uP4lG8QI2a/54RstN fFKB4+x2LckQ4fPk0tgAB/QmgD/olIXyNf+75/Qy+UByT5XBBn1QoYmZ2WMoH8YEzQe6 8zJw== 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=sox7ee7V5Po44Z4VCeKp9Y5x0oWwgRxCIHi7x/SiDwXiPme126oDg7bsoiaID4o8kB y1OcVUoneYXAuzrstPdQxob/E8QRxgtU86fws+lZ6wBxK8Krq6L7dHJ6jjY/6TuV/qt0 zNnzChrzCv0JPGoIB1R0S8frSqS5DEjNiPhdehzJzSfG8ES5Qcnmy+lnWo6/iZQWdypl rdG0PI4T3+TlYIYSJeN9GEC0csru6HyOz2IOQhBkcblWvzht8/MH/HgA7xliCIdBNwJC mUUTu5lOZSfu7tp6dhKl5i+BbhHpgpPJWe27MrhCHeZ7MU9QD8Xh3Tn/aZYBgBlamkCQ LzCA== X-Gm-Message-State: AN3rC/4yLWJkYEBVaNM9PdL7e3Br9BGpopd23QjjwuFnrXoX6WcrHisK m8QcgQQYQRqnXw== X-Received: by 10.107.142.198 with SMTP id q189mr35364527iod.49.1493743100538; Tue, 02 May 2017 09:38:20 -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 f87sm8131322ioj.0.2017.05.02.09.38.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 May 2017 09:38:19 -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:38:10 -0400 Message-Id: <20170502163812.6211-7-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170502163812.6211-6-trond.myklebust@primarydata.com> References: <20170502163812.6211-1-trond.myklebust@primarydata.com> <20170502163812.6211-2-trond.myklebust@primarydata.com> <20170502163812.6211-3-trond.myklebust@primarydata.com> <20170502163812.6211-4-trond.myklebust@primarydata.com> <20170502163812.6211-5-trond.myklebust@primarydata.com> <20170502163812.6211-6-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;