aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnna Schumaker <Anna.Schumaker@Netapp.com>2017-01-11 16:17:17 -0500
committerAnna Schumaker <Anna.Schumaker@Netapp.com>2017-01-30 13:14:50 -0500
commit334f87dd11b7a0ed8f3d3b223fb5cede201e210a (patch)
tree0d675d7021b7bd2ccc49a898b6af9a75a9c63f59
parentd7e9825848cede4cf7589b63029b76428ae76958 (diff)
NFS: Remove nfs4_recover_expired_lease()
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>
-rw-r--r--fs/nfs/nfs4proc.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 031b867aaefa..baf968990475 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -2311,11 +2311,6 @@ static int _nfs4_proc_open(struct nfs4_opendata *data)
2311 return 0; 2311 return 0;
2312} 2312}
2313 2313
2314static int nfs4_recover_expired_lease(struct nfs_server *server)
2315{
2316 return nfs4_client_recover_expired_lease(server->nfs_client);
2317}
2318
2319/* 2314/*
2320 * OPEN_EXPIRED: 2315 * OPEN_EXPIRED:
2321 * reclaim state on the server after a network partition. 2316 * reclaim state on the server after a network partition.
@@ -2693,7 +2688,7 @@ static int _nfs4_do_open(struct inode *dir,
2693 dprintk("nfs4_do_open: nfs4_get_state_owner failed!\n"); 2688 dprintk("nfs4_do_open: nfs4_get_state_owner failed!\n");
2694 goto out_err; 2689 goto out_err;
2695 } 2690 }
2696 status = nfs4_recover_expired_lease(server); 2691 status = nfs4_client_recover_expired_lease(server->nfs_client);
2697 if (status != 0) 2692 if (status != 0)
2698 goto err_put_state_owner; 2693 goto err_put_state_owner;
2699 if (d_really_is_positive(dentry)) 2694 if (d_really_is_positive(dentry))