From patchwork Sun Jul 24 21:30:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9245079 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 82C2E607FD for ; Sun, 24 Jul 2016 21:31:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 774FD2522B for ; Sun, 24 Jul 2016 21:31:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6C13C26224; Sun, 24 Jul 2016 21:31:45 +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 145612522B for ; Sun, 24 Jul 2016 21:31:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752550AbcGXVbn (ORCPT ); Sun, 24 Jul 2016 17:31:43 -0400 Received: from mail-it0-f67.google.com ([209.85.214.67]:36779 "EHLO mail-it0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752540AbcGXVbn (ORCPT ); Sun, 24 Jul 2016 17:31:43 -0400 Received: by mail-it0-f67.google.com with SMTP id j124so6500593ith.3 for ; Sun, 24 Jul 2016 14:31:42 -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=mXL7Kexbt4K8sODaI++aH0t9eqok2/khjWzLHgzt8MM=; b=Hg0zG7J7bO8AyjHG53o+BAPLhuaeRvmQafdMtyQ6f+jAG8jXfJ2GwkuBQn4KC9zbk8 ACEc+bCXOxNpwnKAhGXL1D5WSiwfR54WB4X7BmuWH+p86EwihzkF3OxqaLYZak0vmLs8 jP5vp2Ql8jj+8jcpKRUcSS7JW1QubolzGdj9G93iDFhPtmrVMo+RbA+XrTe+5tXBUK3P EzmKZI5OOoa2Co4lT1DUWbjO+SYigSmAYc2uYYLTL3O0yI3rkClS20BfeAh0294L0gvc b6VjcffhcokUqJGgo/CdskdN/AqEAF+RqlO6j72LG3BJ6Ex+5S5thpWl/zAHIjGjIwcy 02/g== 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=mXL7Kexbt4K8sODaI++aH0t9eqok2/khjWzLHgzt8MM=; b=DEG53zn2Kw2zgtmdkSNi3U9tm1kM9mwwrzzpXJD9B/myRrxfzVxCvHXMyOBpWdSxPS I1FAMAt6ZCBMq/kzrXa3W2GnG4b+LfgZnivyJJV1A6jIlhjj/JipAroRoIFmYs61bbK8 Kv6ofyCXrxHe9rdro0MYFE+U6AP9xXqoFfLKrMBTWjk06jj4gv59lQ68vOlcNg3zbdzm deCndy1ebNUmqBrwYG1cFjvBnYspxMuTKN0+XNEvyTrdDJN/y4ahJwcHWCWIUn7/qBEI 4EepUf2+izQ8TBOj9wTJzDl2e4INglnO+V0ox0mC3XUXE/Nd5nVGUc1EoD0WgbebkPpi QLTQ== X-Gm-Message-State: AEkoouuzqp8nZUps01lqyrNfl+02iw3qU2eotaB+kqQLPDNwoysSa+Ald3MxRjgTBOzjrA== X-Received: by 10.36.26.81 with SMTP id 78mr17548320iti.4.1469395902038; Sun, 24 Jul 2016 14:31:42 -0700 (PDT) Received: from leira.trondhjem.org.localdomain (c-68-49-162-121.hsd1.mi.comcast.net. [68.49.162.121]) by smtp.gmail.com with ESMTPSA id r128sm8100341ita.6.2016.07.24.14.31.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 24 Jul 2016 14:31:41 -0700 (PDT) From: Trond Myklebust To: linux-nfs@vger.kernel.org Subject: [PATCH v3 09/14] pNFS: Cleanup - don't open code pnfs_mark_layout_stateid_invalid() Date: Sun, 24 Jul 2016 17:30:54 -0400 Message-Id: <1469395859-83194-10-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1469395859-83194-9-git-send-email-trond.myklebust@primarydata.com> References: <1469395859-83194-1-git-send-email-trond.myklebust@primarydata.com> <1469395859-83194-2-git-send-email-trond.myklebust@primarydata.com> <1469395859-83194-3-git-send-email-trond.myklebust@primarydata.com> <1469395859-83194-4-git-send-email-trond.myklebust@primarydata.com> <1469395859-83194-5-git-send-email-trond.myklebust@primarydata.com> <1469395859-83194-6-git-send-email-trond.myklebust@primarydata.com> <1469395859-83194-7-git-send-email-trond.myklebust@primarydata.com> <1469395859-83194-8-git-send-email-trond.myklebust@primarydata.com> <1469395859-83194-9-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 dc50ba4d84ad..8c453515d98c 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -7931,8 +7931,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); status = -EAGAIN; diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c index 52b2a4dfdcb0..1374fcd40484 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 2f4f26905c03..d71c9493693a 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);