diff options
| author |  Arnd Bergmann <arnd@arndb.de>
| 2019-11-04 14:43:17 +0100 |
|---|---|---|
| committer |  J. Bruce Fields <bfields@redhat.com>
| 2019-12-19 17:46:08 -0500 |
| commit | 9594497f2c78993cb66b696122f7c65528ace985 (patch) | |
| tree | 822b5fb65ed4c50634cd3ceb6aa6427c124e506b /fs/nfsd/state.h | |
| parent | nfsd: fix delay timer on 32-bit architectures (diff) | |
| download | linux-9594497f2c78993cb66b696122f7c65528ace985.tar.gz linux-9594497f2c78993cb66b696122f7c65528ace985.tar.bz2 linux-9594497f2c78993cb66b696122f7c65528ace985.zip | |
nfsd: fix jiffies/time_t mixup in LRU list
The nfsd4_blocked_lock->nbl_time timestamp is recorded in jiffies,
but then compared to a CLOCK_REALTIME timestamp later on, which makes
no sense.
For consistency with the other timestamps, change this to use a time_t.
This is a change in behavior, which may cause regressions, but the
current code is not sensible. On a system with CONFIG_HZ=1000,
the 'time_after((unsigned long)nbl->nbl_time, (unsigned long)cutoff))'
check is false for roughly the first 18 days of uptime and then true
for the next 49 days.
Fixes: 7919d0a27f1e ("nfsd: add a LRU list for blocked locks")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd/state.h')
| -rw-r--r-- | fs/nfsd/state.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfsd/state.h b/fs/nfsd/state.h index 6cf442033786..df6bd2cb257f 100644 --- a/fs/nfsd/state.h +++ b/fs/nfsd/state.h @@ -626,7 +626,7 @@ static inline bool nfsd4_stateid_generation_after(stateid_t *a, stateid_t *b) struct nfsd4_blocked_lock { struct list_head nbl_list; struct list_head nbl_lru; - unsigned long nbl_time; + time_t nbl_time; struct file_lock nbl_lock; struct knfsd_fh nbl_fh; struct nfsd4_callback nbl_cb; |