Commit d22aad29 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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"
parents 06b31bdb 831e3f54

net/sunrpc/cache.c

+1 −5
Original line number Diff line number Diff line
@@ -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;