summaryrefslogtreecommitdiffstats
path: root/fs/nfsd/nfs4xdr.c
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@citi.umich.edu>2010-03-01 05:20:19 +0100
committerJ. Bruce Fields <bfields@citi.umich.edu>2010-03-06 21:02:01 +0100
commitcf07d2ea43e5c22149435ee9002cb737eac20eca (patch)
treebe8af254331398b2be20090b2b61da432229f109 /fs/nfsd/nfs4xdr.c
parentMerge branch 'for-linus' of git://oss.sgi.com/xfs/xfs into for-2.6.34-incoming (diff)
downloadlinux-cf07d2ea43e5c22149435ee9002cb737eac20eca.tar.xz
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/nfs4xdr.c')
-rw-r--r--fs/nfsd/nfs4xdr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index c458fb11c957..f61bd736152b 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -1899,7 +1899,7 @@ nfsd4_encode_fattr(struct svc_fh *fhp, struct svc_export *exp,
if (bmval0 & FATTR4_WORD0_LEASE_TIME) {
if ((buflen -= 4) < 0)
goto out_resource;
- WRITE32(NFSD_LEASE_TIME);
+ WRITE32(nfsd4_lease);
}
if (bmval0 & FATTR4_WORD0_RDATTR_ERROR) {
if ((buflen -= 4) < 0)