summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@citi.umich.edu>2009-04-29 11:36:17 -0400
committerJ. Bruce Fields <bfields@citi.umich.edu>2009-04-29 11:36:17 -0400
commitb8fd47aefa5f13df1edacbc7e68d9874635109e5 (patch)
tree25eb59eb5b533b272c317a2a6854430cc5e29320 /fs
parentc654b8a9cba6002aad1c01919e4928a79a4a6dcf (diff)
downloadlinux-b8fd47aefa5f13df1edacbc7e68d9874635109e5.tar.gz
linux-b8fd47aefa5f13df1edacbc7e68d9874635109e5.tar.bz2
linux-b8fd47aefa5f13df1edacbc7e68d9874635109e5.zip
nfsd: quiet compile warning
Stephen Rothwell said: "Today's linux-next build (powerpc ppc64_defconfig) produced this new warning: fs/nfsd/nfs4state.c: In function 'EXPIRED_STATEID': fs/nfsd/nfs4state.c:2757: warning: comparison of distinct pointer types lacks a cast Caused by commit 78155ed75f470710f2aecb3e75e3d97107ba8374 ("nfsd4: distinguish expired from stale stateids")." Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Diffstat (limited to 'fs')
-rw-r--r--fs/nfsd/nfs4state.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 74e822ec34cb..d24dd12ddb4d 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -2754,7 +2754,7 @@ EXPIRED_STATEID(stateid_t *stateid)
{
if (time_before((unsigned long)boot_time,
((unsigned long)stateid->si_boot)) &&
- time_before((stateid->si_boot + lease_time), get_seconds())) {
+ time_before((unsigned long)(stateid->si_boot + lease_time), get_seconds())) {
dprintk("NFSD: expired stateid (%08x/%08x/%08x/%08x)!\n",
stateid->si_boot, stateid->si_stateownerid,
stateid->si_fileid, stateid->si_generation);