From patchwork Fri Jul 22 19:33:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9244167 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 CB23A6088F for ; Fri, 22 Jul 2016 19:34:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BC66922376 for ; Fri, 22 Jul 2016 19:34:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A18A527D76; Fri, 22 Jul 2016 19:34:37 +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 42742223A4 for ; Fri, 22 Jul 2016 19:34:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752977AbcGVTeg (ORCPT ); Fri, 22 Jul 2016 15:34:36 -0400 Received: from mail-io0-f195.google.com ([209.85.223.195]:36527 "EHLO mail-io0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751928AbcGVTef (ORCPT ); Fri, 22 Jul 2016 15:34:35 -0400 Received: by mail-io0-f195.google.com with SMTP id y34so8006153ioi.3 for ; Fri, 22 Jul 2016 12:34:34 -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=fh70iL49oChxT9ESlg/Jw2X4SeML2HyrgRri0Tj9mU8=; b=uIG/7rJrOCHo1chLIsyiRnOOYhXppicPPQo7vk84e1LmuDXCJg9agCZmAgAe2+c9+E wFqziiWTvYsJkalKMbca5VNRRh6JclFxr/ffiM4T2izNbq01QvCo4FYSmiOjcmeYm9Z6 sGjzFqH7D5T7YlUp3o6P/3IeFJwpWNXhxCLgYTXwQfzkKX8ji+tIZ+bBp1HEJB9lPbFZ Vhvvn1iz7TqSCUBmFRDL7jLAZNR0FjYtPvHXog1FFow/nApi6P4vUTUvWoO/PJHZ7lWs nw0D6JWEAguGLPSPhruEriM2Ysz3pX0Pqr5uoTnzPHJDSy5sKQYNVCiObZL5fsph4eX3 SfVw== 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=fh70iL49oChxT9ESlg/Jw2X4SeML2HyrgRri0Tj9mU8=; b=FPQ/njDgGlsFaVxDM4XG4xwTqJAKREd3N1rwLduORhG9xNLJDr/iM6ut09nZu8nBhU g3vriY7c+sKcfwzTKYtROHLTRtmUGqwRnEC32Rp9lm0HM+D3+zAh644Ra0IGSM11TWsu KLl79AEQg/mkyU7A7U4wCpV2or6vLXLi76YbJs9ex5xhmxBcFjANRbLC7VuFhkiAqKSD 7y847MJqlGwkrsrS++JRodKRFv5Dn4e4YZrldcb6z7/700XqKF3l0sQN/ufyNzXaPIlD 21zqy2kXhtRL+qWmcgBqM8jG8bYFtlbMfDYDYXcEDugI8rIvex/KHby6ubD7zeVPOh+L xyHw== X-Gm-Message-State: AEkoout0j2+qfBz+FZLIKLUks7NpgDH0cuPr+8y21zNmMpvey7t8ZDwxPrzRPGMLctMoGw== X-Received: by 10.107.185.133 with SMTP id j127mr6674911iof.32.1469216074104; Fri, 22 Jul 2016 12:34:34 -0700 (PDT) Received: from leira.trondhjem.org.localdomain ([50.108.12.87]) by smtp.gmail.com with ESMTPSA id v77sm3888948ita.12.2016.07.22.12.34.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Jul 2016 12:34:31 -0700 (PDT) From: Trond Myklebust To: linux-nfs@vger.kernel.org Subject: [PATCH 1/6] pNFS: Clear the layout return tracking on layout reinitialisation Date: Fri, 22 Jul 2016 15:33:53 -0400 Message-Id: <1469216038-71882-2-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1469216038-71882-1-git-send-email-trond.myklebust@primarydata.com> References: <1469216038-71882-1-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 Ensure that we don't carry over layoutreturn info from a previous incarnation of this layout. Signed-off-by: Trond Myklebust --- fs/nfs/pnfs.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c index 0c7e0d45a4de..27052d4b46ef 100644 --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c @@ -871,15 +871,21 @@ void pnfs_clear_layoutreturn_waitbit(struct pnfs_layout_hdr *lo) rpc_wake_up(&NFS_SERVER(lo->plh_inode)->roc_rpcwaitq); } +static void +pnfs_clear_layoutreturn_info(struct pnfs_layout_hdr *lo) +{ + lo->plh_return_iomode = 0; + lo->plh_return_seq = 0; + clear_bit(NFS_LAYOUT_RETURN_REQUESTED, &lo->plh_flags); +} + static bool pnfs_prepare_layoutreturn(struct pnfs_layout_hdr *lo) { if (test_and_set_bit(NFS_LAYOUT_RETURN, &lo->plh_flags)) return false; - lo->plh_return_iomode = 0; - lo->plh_return_seq = 0; pnfs_get_layout_hdr(lo); - clear_bit(NFS_LAYOUT_RETURN_REQUESTED, &lo->plh_flags); + pnfs_clear_layoutreturn_info(lo); return true; } @@ -1760,7 +1766,10 @@ pnfs_layout_process(struct nfs4_layoutget *lgp) lo->plh_barrier = be32_to_cpu(res->stateid.seqid); } - clear_bit(NFS_LAYOUT_INVALID_STID, &lo->plh_flags); + if (test_bit(NFS_LAYOUT_INVALID_STID, &lo->plh_flags)) { + pnfs_clear_layoutreturn_info(lo); + clear_bit(NFS_LAYOUT_INVALID_STID, &lo->plh_flags); + } pnfs_get_lseg(lseg); pnfs_layout_insert_lseg(lo, lseg, &free_me);