diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-04-26 10:43:03 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-04-26 10:43:03 -0700 |
| commit | d22aad29de2a7b13f43ccb9b55cfd5daf793ead4 (patch) | |
| tree | 8bde119ea9232353e4e6a36577b9de7d55e9b441 /net | |
| parent | 06b31bdbf84990c60adba7185fe4a340473120cb (diff) | |
| parent | 831e3f545b0771f91fa94cdb8aa569a73b9ec580 (diff) | |
Merge tag 'nfsd-6.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux
Pull nfsd fix from Chuck Lever:
- Revert a v6.15 patch due to a report of SELinux test failures
* tag 'nfsd-6.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux:
Revert "sunrpc: clean cache_detail immediately when flush is written frequently"
Diffstat (limited to 'net')
| -rw-r--r-- | net/sunrpc/cache.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/net/sunrpc/cache.c b/net/sunrpc/cache.c index 004cdb59f010..7ce5e28a6c03 100644 --- a/net/sunrpc/cache.c +++ b/net/sunrpc/cache.c @@ -1536,13 +1536,9 @@ static ssize_t write_flush(struct file *file, const char __user *buf, * or by one second if it has already reached the current time. * Newly added cache entries will always have ->last_refresh greater * that ->flush_time, so they don't get flushed prematurely. - * - * If someone frequently calls the flush interface, we should - * immediately clean the corresponding cache_detail instead of - * continuously accumulating nextcheck. */ - if (cd->flush_time >= now && cd->flush_time < (now + 5)) + if (cd->flush_time >= now) now = cd->flush_time + 1; cd->flush_time = now; |