Commit f958a132 authored by J. Bruce Fields's avatar J. Bruce Fields
Browse files

nfsd4: remove unnecessary lease-setting function 



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

Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
parent e46b498c

fs/nfsd/nfs4state.c

+0 −12
Original line number Diff line number Diff line
@@ -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;

}

fs/nfsd/nfsctl.c

+1 −1
Original line number Diff line number Diff line
@@ -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);