diff options
| author | J. Bruce Fields <bfields@citi.umich.edu> | 2010-03-01 19:43:02 -0500 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2010-03-06 15:02:03 -0500 |
| commit | f958a1320ff7a1e0e861d3c90de6da12a88839dc (patch) | |
| tree | 32ab7959a6bf6c6062634eb2a10ba1cbaf6451bb | |
| parent | e46b498c84163e86e2627c30bca298c968664f65 (diff) | |
| download | blackbird-op-linux-f958a1320ff7a1e0e861d3c90de6da12a88839dc.tar.gz blackbird-op-linux-f958a1320ff7a1e0e861d3c90de6da12a88839dc.zip | |
nfsd4: remove unnecessary lease-setting function
This is another layer of indirection that doesn't really buy us
anything.
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
| -rw-r--r-- | fs/nfsd/nfs4state.c | 12 | ||||
| -rw-r--r-- | fs/nfsd/nfsctl.c | 2 |
2 files changed, 1 insertions, 13 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index eb8d124ec14d..4471046e19e0 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -4115,15 +4115,3 @@ nfs4_recoverydir(void) { return user_recovery_dirname; } - -/* - * Called when leasetime is changed. - * - * nfsd4_lease is protected by nfsd_mutex since it's only really accessed - * when nfsd is starting - */ -void -nfs4_reset_lease(time_t leasetime) -{ - nfsd4_lease = leasetime; -} diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c index 8bff6741b1e6..6738e9d8a83d 100644 --- a/fs/nfsd/nfsctl.c +++ b/fs/nfsd/nfsctl.c @@ -1219,7 +1219,7 @@ static ssize_t __write_leasetime(struct file *file, char *buf, size_t size) return rv; if (lease < 10 || lease > 3600) return -EINVAL; - nfs4_reset_lease(lease); + nfsd4_lease = lease; } return scnprintf(buf, SIMPLE_TRANSACTION_LIMIT, "%ld\n", nfsd4_lease); |
