Received: by 2002:a25:f815:0:0:0:0:0 with SMTP id u21csp3255873ybd; Fri, 28 Jun 2019 05:37:23 -0700 (PDT) X-Google-Smtp-Source: APXvYqw5DhUY2E3qTKGvRKdJ8aLKWM9we6NR4P9+OZsyTi/YzLLp6qmxcfa4X7LEw0fNOqb1xeZB X-Received: by 2002:a17:90a:fa12:: with SMTP id cm18mr12891465pjb.137.1561725443158; Fri, 28 Jun 2019 05:37:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1561725443; cv=none; d=google.com; s=arc-20160816; b=C1bDczUZTIcJJv2h+j/dLSNx7p1A0OqD9PxabKBWU8A7SXww9Fu9NBVZnMhLcPoW6m +0Td/ztY8ZwOR6sPiQUQTN/RS4LoL8EK16s8OhEBtH+e22F8t3XfoVNBT2Av6jvynhuL 13mIySxphGekAooFupAz0hhLTQg4gPKqwFptvzu4Qjxc7wF79l9qscbapYF/VUCdJA3L YrwwlHaPq7hTd4CMbTri5PwMSSZqFP/sSWsObrI2gdWFXw6tFt27MfPPYNMmiCNN22lk BYd9axpC+M6sbgC2Zepq5xFjieOf7e2nO/NcXqfSIICmLDd0GjTkj58YMoTWIJTbOkzJ DS+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=BsSkOyHpHwjSwTxJg9o/SfOgNkx1zOoGQ1FdeKj1Ia4=; b=YXAXlUJ8R8PeK3PDssmt7G2m7ksPOCZnMeoYzhZnfAws1eNjtweP+rCH9feRKjbnIl gn+wjjL9R38/8XPI/aj7UacKoKh5l6gNuUYO15gurgT/BYKgtkj+mYKlEvzIwZ3yiGOx HilflLHQs+VNsyMFxLhZ7YHHlgNZhqUhmEcNGO2WGBZHHRCG7XM1tsTJBcjlvYPNOX66 6jYU86oie2as1P7wwQiLJ1amY71kjMRdMsQXhTsIPi/l9fEcM9zHN+8c05/dMLUtaW81 yHqbrccKRgyGsRC72RAMMvu8IqSZqV+KJI5vn0kIQ4CQ5MFefGDtckcd7QMia4q1H3N0 F3hA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-nfs-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o2si2535322pfg.136.2019.06.28.05.37.03; Fri, 28 Jun 2019 05:37:22 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-nfs-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-nfs-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726702AbfF1MhC (ORCPT + 99 others); Fri, 28 Jun 2019 08:37:02 -0400 Received: from mx3.molgen.mpg.de ([141.14.17.11]:41663 "EHLO mx1.molgen.mpg.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726687AbfF1MhC (ORCPT ); Fri, 28 Jun 2019 08:37:02 -0400 Received: from theinternet.molgen.mpg.de (theinternet.molgen.mpg.de [141.14.31.7]) by mx.molgen.mpg.de (Postfix) with ESMTP id C148320669589; Fri, 28 Jun 2019 14:37:00 +0200 (CEST) From: Donald Buczek To: linux-nfs@vger.kernel.org, trond.myklebust@hammerspace.com, anna.schumaker@netapp.com Cc: Donald Buczek Subject: [PATCH 2/4 RESEND] nfs4: Rename nfs41_setup_state_renewal Date: Fri, 28 Jun 2019 14:36:38 +0200 Message-Id: <20190628123640.8715-3-buczek@molgen.mpg.de> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190628123640.8715-1-buczek@molgen.mpg.de> References: <20190628123640.8715-1-buczek@molgen.mpg.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org The function nfs41_setup_state_renewal is useful to the nfs 4.0 client as well, so rename the function to nfs4_setup_state_renewal. Signed-off-by: Donald Buczek --- fs/nfs/nfs4state.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c index e2e3c4f04d3e..778ebfb00d13 100644 --- a/fs/nfs/nfs4state.c +++ b/fs/nfs/nfs4state.c @@ -286,7 +286,7 @@ static int nfs4_begin_drain_session(struct nfs_client *clp) #if defined(CONFIG_NFS_V4_1) -static int nfs41_setup_state_renewal(struct nfs_client *clp) +static int nfs4_setup_state_renewal(struct nfs_client *clp) { int status; struct nfs_fsinfo fsinfo; @@ -313,7 +313,7 @@ static void nfs41_finish_session_reset(struct nfs_client *clp) clear_bit(NFS4CLNT_SESSION_RESET, &clp->cl_state); /* create_session negotiated new slot table */ clear_bit(NFS4CLNT_BIND_CONN_TO_SESSION, &clp->cl_state); - nfs41_setup_state_renewal(clp); + nfs4_setup_state_renewal(clp); } int nfs41_init_clientid(struct nfs_client *clp, const struct cred *cred) -- 2.22.0