summaryrefslogtreecommitdiffstats
path: root/fs/nfsd/nfsctl.c
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@citi.umich.edu>2010-02-28 23:20:19 -0500
committerJ. Bruce Fields <bfields@citi.umich.edu>2010-03-06 15:02:01 -0500
commitcf07d2ea43e5c22149435ee9002cb737eac20eca (patch)
treebe8af254331398b2be20090b2b61da432229f109 /fs/nfsd/nfsctl.c
parent4ea41e2de5bba756858bb40f964e3490b6d1a25c (diff)
downloadlinux-cf07d2ea43e5c22149435ee9002cb737eac20eca.tar.gz
linux-cf07d2ea43e5c22149435ee9002cb737eac20eca.tar.bz2
linux-cf07d2ea43e5c22149435ee9002cb737eac20eca.zip
nfsd4: simplify references to nfsd4 lease time
Instead of accessing the lease time directly, some users call nfs4_lease_time(), and some a macro, NFSD_LEASE_TIME, defined as nfs4_lease_time(). Neither layer of indirection serves any purpose. Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Diffstat (limited to 'fs/nfsd/nfsctl.c')
-rw-r--r--fs/nfsd/nfsctl.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c
index 0f0e77f2012f..8bff6741b1e6 100644
--- a/fs/nfsd/nfsctl.c
+++ b/fs/nfsd/nfsctl.c
@@ -1203,8 +1203,6 @@ static ssize_t write_maxblksize(struct file *file, char *buf, size_t size)
}
#ifdef CONFIG_NFSD_V4
-extern time_t nfs4_leasetime(void);
-
static ssize_t __write_leasetime(struct file *file, char *buf, size_t size)
{
/* if size > 10 seconds, call
@@ -1224,8 +1222,7 @@ static ssize_t __write_leasetime(struct file *file, char *buf, size_t size)
nfs4_reset_lease(lease);
}
- return scnprintf(buf, SIMPLE_TRANSACTION_LIMIT, "%ld\n",
- nfs4_lease_time());
+ return scnprintf(buf, SIMPLE_TRANSACTION_LIMIT, "%ld\n", nfsd4_lease);
}
/**