Revert "sunrpc: clean cache_detail immediately when flush is written frequently"
authorChuck Lever <chuck.lever@oracle.com>
Thu, 24 Apr 2025 13:27:35 +0000 (09:27 -0400)
committerChuck Lever <chuck.lever@oracle.com>
Sat, 26 Apr 2025 16:00:43 +0000 (12:00 -0400)
Ondrej reports that certain SELinux tests are failing after commit
fc2a169c56de ("sunrpc: clean cache_detail immediately when flush is
written frequently"), merged during the v6.15 merge window.

Reported-by: Ondrej Mosnacek <omosnace@redhat.com>
Fixes: fc2a169c56de ("sunrpc: clean cache_detail immediately when flush is written frequently")
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
net/sunrpc/cache.c

index 004cdb5..7ce5e28 100644 (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;