redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

nfsd4: remove unnecessary lease-setting function

Browse source 
This is another layer of indirection that doesn't really buy us
anything.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
This commit is contained in:
J. Bruce Fields 2010-03-01 19:43:02 -05:00
parent e46b498c84
commit f958a1320f
2 changed files with 1 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
fs/nfsd/nfs4state.c
View file

@ -4115,15 +4115,3 @@ nfs4_recoverydir(void)
{ {
return user_recovery_dirname; 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;
}

2
fs/nfsd/nfsctl.c
View file

@ -1219,7 +1219,7 @@ static ssize_t __write_leasetime(struct file *file, char *buf, size_t size)
return rv; return rv;
if (lease < 10 || lease > 3600) if (lease < 10 || lease > 3600)
return -EINVAL; return -EINVAL;
nfs4_reset_lease(lease); nfsd4_lease = lease;
} }
return scnprintf(buf, SIMPLE_TRANSACTION_LIMIT, "%ld\n", nfsd4_lease); return scnprintf(buf, SIMPLE_TRANSACTION_LIMIT, "%ld\n", nfsd4_lease);