linux-nfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: <Anna.Schumaker@Netapp.com>
To: <linux-nfs@vger.kernel.org>
Subject: [PATCH v2 06/10] NFS: Remove nfs4_recover_expired_lease()
Date: Tue, 17 Jan 2017 15:32:01 -0500	[thread overview]
Message-ID: <20170117203205.29033-7-Anna.Schumaker@Netapp.com> (raw)
In-Reply-To: <20170117203205.29033-1-Anna.Schumaker@Netapp.com>

From: Anna Schumaker <Anna.Schumaker@Netapp.com>

This function doesn't add much, since all it does is access the server's
nfs_client variable.

Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
---
 fs/nfs/nfs4proc.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 02767aced45c..bde48f02bd28 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -2308,11 +2308,6 @@ static int _nfs4_proc_open(struct nfs4_opendata *data)
 	return 0;
 }
 
-static int nfs4_recover_expired_lease(struct nfs_server *server)
-{
-	return nfs4_client_recover_expired_lease(server->nfs_client);
-}
-
 /*
  * OPEN_EXPIRED:
  * 	reclaim state on the server after a network partition.
@@ -2689,7 +2684,7 @@ static int _nfs4_do_open(struct inode *dir,
 		dprintk("nfs4_do_open: nfs4_get_state_owner failed!\n");
 		goto out_err;
 	}
-	status = nfs4_recover_expired_lease(server);
+	status = nfs4_client_recover_expired_lease(server->nfs_client);
 	if (status != 0)
 		goto err_put_state_owner;
 	if (d_really_is_positive(dentry))
-- 
2.11.0


  parent reply	other threads:[~2017-01-17 20:32 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-01-17 20:31 [PATCH v2 00/10] Various cleanups to nfs4proc.c Anna.Schumaker
2017-01-17 20:31 ` [PATCH v2 01/10] NFS: Fix inconsistent indentation in nfs4proc.c Anna.Schumaker
2017-01-17 20:31 ` [PATCH v2 02/10] NFS: Clean up _nfs4_is_integrity_protected() Anna.Schumaker
2017-01-17 20:31 ` [PATCH v2 03/10] NFS: Remove nfs4_wait_for_completion_rpc_task() Anna.Schumaker
2017-01-17 20:31 ` [PATCH v2 04/10] NFS: Return errors directly in _nfs4_opendata_reclaim_to_nfs4_state() Anna.Schumaker
2017-01-17 20:32 ` [PATCH v2 05/10] NFS: Remove an extra if in _nfs4_recover_proc_open() Anna.Schumaker
2017-01-17 20:32 ` Anna.Schumaker [this message]
2017-01-17 20:32 ` [PATCH v2 07/10] NFS: Remove unnecessary goto in nfs4_lookup_root_sec() Anna.Schumaker
2017-01-17 20:32 ` [PATCH v2 08/10] NFS: No need to set and return status in nfs41_lock_expired() Anna.Schumaker
2017-01-17 20:32 ` [PATCH v2 09/10] NFS: Clean up nfs41_same_server_scope() Anna.Schumaker
2017-01-17 20:32 ` [PATCH v2 10/10] NFS: Return the comparison result directly in nfs41_match_stateid() Anna.Schumaker

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170117203205.29033-7-Anna.Schumaker@Netapp.com \
    --to=anna.schumaker@netapp.com \
    --cc=linux-nfs@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).