Skip to content

Commit 831e3f5

Browse files
committed
Revert "sunrpc: clean cache_detail immediately when flush is written frequently"
Ondrej reports that certain SELinux tests are failing after commit fc2a169 ("sunrpc: clean cache_detail immediately when flush is written frequently"), merged during the v6.15 merge window. Reported-by: Ondrej Mosnacek <[email protected]> Fixes: fc2a169 ("sunrpc: clean cache_detail immediately when flush is written frequently") Signed-off-by: Chuck Lever <[email protected]>
1 parent a1d14d9 commit 831e3f5

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

net/sunrpc/cache.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1536,13 +1536,9 @@ static ssize_t write_flush(struct file *file, const char __user *buf,
15361536
* or by one second if it has already reached the current time.
15371537
* Newly added cache entries will always have ->last_refresh greater
15381538
* that ->flush_time, so they don't get flushed prematurely.
1539-
*
1540-
* If someone frequently calls the flush interface, we should
1541-
* immediately clean the corresponding cache_detail instead of
1542-
* continuously accumulating nextcheck.
15431539
*/
15441540

1545-
if (cd->flush_time >= now && cd->flush_time < (now + 5))
1541+
if (cd->flush_time >= now)
15461542
now = cd->flush_time + 1;
15471543

15481544
cd->flush_time = now;

0 commit comments

Comments
 (0)