From patchwork Fri Jul 22 19:33:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9244177 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 7D0FC6077C for ; Fri, 22 Jul 2016 19:34:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6EFFB27FBB for ; Fri, 22 Jul 2016 19:34:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 617A927FBE; Fri, 22 Jul 2016 19:34:58 +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 05F3D27FBB for ; Fri, 22 Jul 2016 19:34:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753254AbcGVTe5 (ORCPT ); Fri, 22 Jul 2016 15:34:57 -0400 Received: from mail-io0-f196.google.com ([209.85.223.196]:34880 "EHLO mail-io0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753016AbcGVTe4 (ORCPT ); Fri, 22 Jul 2016 15:34:56 -0400 Received: by mail-io0-f196.google.com with SMTP id q83so8028146iod.2 for ; Fri, 22 Jul 2016 12:34:56 -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=658sKwqWbD1a4GDPUKNqetdh7yMQAMsOg8KeqPu7bM4=; b=vLzBl0gVGXYLtLG8WnCvF7Gmn67dodnkoYkK5znH7yyn42G/LjMe5/K+auo/TOd5J5 JDUXbyE2AbmfBeRuT6k4tbXo68X+DQBxDUcKOLJbbTuOWGBnqA/bJhHZResUFLKT7d9S HG6BJ0wf25+FuGWuzvNPbBPDB0U/21eyqcDWL880+c5jOwIv5TdHopKXN5A1Kf1IeTMS o1c7J+rdQTT+wJd7gse3U+lTZOm5Eg23W7EchZgGWw76EuUBtJOQaI7MpKNnzY8kEh0h Q8RZwBkT5aCSOEkNM8FMCsmxa+nSfEyjIvVYddzKJ62cVbPz3hA6Q6ZrsVsGK0IRIIi7 uPkw== 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=658sKwqWbD1a4GDPUKNqetdh7yMQAMsOg8KeqPu7bM4=; b=OwsdcrEbAnp1sU09A4dIEQoOsAeB9nlzWBMLqc4JLpejKTLRKVVGyzSKWgaWRWu1YF akAUTQVA91hsbGEQ67oDgqwXh+dDcJ7JHLWyrAH8ZTuHlalBPrdJ9UUQEWw7T16qpzgN RhmRQUqqjjuz7WJM6ZlIWi22BmwTCVvMzsEsXLg2KhLOX6qZRp7RnVC/RSMnj0RQW08N x2j/TDTE+ypr7YbE9kOZD/1V5EJrWA/ZjpnPtUq7vI2CpmsEnwEYwoUhLPvGkTlhK+D+ 7oE8OP652ZyiGfevcgAkfGCbHoNrgt7aeo1UhUMmceRFuakEwGitoqzyleJd45jJ0AE6 qVUg== X-Gm-Message-State: AEkoousNAFeqU0Wk+dPWSo9hzH4yjqkx6qR/6nRMZrobxrfeKR8ivWX4mzkE99ssKh6oXw== X-Received: by 10.107.1.20 with SMTP id 20mr6658216iob.74.1469216095918; Fri, 22 Jul 2016 12:34:55 -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.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Jul 2016 12:34:51 -0700 (PDT) From: Trond Myklebust To: linux-nfs@vger.kernel.org Subject: [PATCH 6/6] pNFS: Cleanup - don't open code pnfs_mark_layout_stateid_invalid() Date: Fri, 22 Jul 2016 15:33:58 -0400 Message-Id: <1469216038-71882-7-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1469216038-71882-6-git-send-email-trond.myklebust@primarydata.com> References: <1469216038-71882-1-git-send-email-trond.myklebust@primarydata.com> <1469216038-71882-2-git-send-email-trond.myklebust@primarydata.com> <1469216038-71882-3-git-send-email-trond.myklebust@primarydata.com> <1469216038-71882-4-git-send-email-trond.myklebust@primarydata.com> <1469216038-71882-5-git-send-email-trond.myklebust@primarydata.com> <1469216038-71882-6-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 nfs42_layoutstat_done() layoutget don't open code layout stateid invalidation. Signed-off-by: Trond Myklebust --- fs/nfs/nfs42proc.c | 3 +-- fs/nfs/nfs4proc.c | 3 +-- fs/nfs/pnfs.c | 2 +- fs/nfs/pnfs.h | 2 ++ 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/fs/nfs/nfs42proc.c b/fs/nfs/nfs42proc.c index aa03ed09ba06..6ea5ad6f0d44 100644 --- a/fs/nfs/nfs42proc.c +++ b/fs/nfs/nfs42proc.c @@ -336,8 +336,7 @@ nfs42_layoutstat_done(struct rpc_task *task, void *calldata) * Mark the bad layout state as invalid, then retry * with the current stateid. */ - set_bit(NFS_LAYOUT_INVALID_STID, &lo->plh_flags); - pnfs_mark_matching_lsegs_invalid(lo, &head, NULL, 0); + pnfs_mark_layout_stateid_invalid(lo, &head); spin_unlock(&inode->i_lock); pnfs_free_lseg_list(&head); } else diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index de97567795a5..676d0e5392c7 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -7932,8 +7932,7 @@ nfs4_layoutget_handle_exception(struct rpc_task *task, * Mark the bad layout state as invalid, then retry * with the current stateid. */ - set_bit(NFS_LAYOUT_INVALID_STID, &lo->plh_flags); - pnfs_mark_matching_lsegs_invalid(lo, &head, NULL, 0); + pnfs_mark_layout_stateid_invalid(lo, &head); spin_unlock(&inode->i_lock); pnfs_free_lseg_list(&head); } else diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c index 0d68768e7afe..7ac0eaa97a89 100644 --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c @@ -259,7 +259,7 @@ pnfs_put_layout_hdr(struct pnfs_layout_hdr *lo) * is required. * Note that caller must hold inode->i_lock. */ -static int +int pnfs_mark_layout_stateid_invalid(struct pnfs_layout_hdr *lo, struct list_head *lseg_list) { diff --git a/fs/nfs/pnfs.h b/fs/nfs/pnfs.h index b21bd0bee784..4a7ab14900d9 100644 --- a/fs/nfs/pnfs.h +++ b/fs/nfs/pnfs.h @@ -268,6 +268,8 @@ int pnfs_mark_matching_lsegs_return(struct pnfs_layout_hdr *lo, struct list_head *tmp_list, const struct pnfs_layout_range *recall_range, u32 seq); +int pnfs_mark_layout_stateid_invalid(struct pnfs_layout_hdr *lo, + struct list_head *lseg_list); bool pnfs_roc(struct inode *ino); void pnfs_roc_release(struct inode *ino); void pnfs_roc_set_barrier(struct inode *ino, u32 barrier);