torvalds/linux
3
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-03-22 07:27:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'nfsd-6.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux

Browse Source 
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"
This commit is contained in:
Linus Torvalds
2025-04-26 10:43:03 -07:00
parent 06b31bdbf8 831e3f545b
commit d22aad29de
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
net/sunrpc/cache.c
View File

@@ -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;