Skip to content

Commit

Permalink
nfsd4: remove unnecessary lease-setting function
Browse files Browse the repository at this point in the history
This is another layer of indirection that doesn't really buy us
anything.

Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
  • Loading branch information
J. Bruce Fields committed Mar 6, 2010
1 parent e46b498 commit f958a13
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 13 deletions.
12 changes: 0 additions & 12 deletions fs/nfsd/nfs4state.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
2 changes: 1 addition & 1 deletion fs/nfsd/nfsctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit f958a13

Please sign in to comment.