summaryrefslogtreecommitdiffstats
path: root/fs/nfs
diff options
context:
space:
mode:
authorAnna Schumaker <Anna.Schumaker@Netapp.com>2017-01-11 22:17:17 +0100
committerAnna Schumaker <Anna.Schumaker@Netapp.com>2017-01-30 19:14:50 +0100
commit334f87dd11b7a0ed8f3d3b223fb5cede201e210a (patch)
tree0d675d7021b7bd2ccc49a898b6af9a75a9c63f59 /fs/nfs
parentNFS: Remove an extra if in _nfs4_recover_proc_open() (diff)
downloadlinux-334f87dd11b7a0ed8f3d3b223fb5cede201e210a.tar.xz
linux-334f87dd11b7a0ed8f3d3b223fb5cede201e210a.zip
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>
Diffstat (limited to 'fs/nfs')
-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)
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.
@@ -2693,7 +2688,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))