Unverified Commit d4e338de authored by David Howells's avatar David Howells Committed by Christian Brauner
Browse files

netfs: Fix is-caching check in read-retry 



netfs: Fix is-caching check in read-retry

The read-retry code checks the NETFS_RREQ_COPY_TO_CACHE flag to determine
if there might be failed reads from the cache that need turning into reads
from the server, with the intention of skipping the complicated part if it
can.  The code that set the flag, however, got lost during the read-side
rewrite.

Fix the check to see if the cache_resources are valid instead.  The flag
can then be removed.

Fixes: ee4cdf7b ("netfs: Speed up buffered reading")
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Link: https://lore.kernel.org/r/3752048.1734381285@warthog.procyon.org.uk


cc: Jeff Layton <jlayton@kernel.org>
cc: netfs@lists.linux.dev
cc: linux-fsdevel@vger.kernel.org
Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent d0327c82

fs/netfs/read_retry.c

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ static void netfs_retry_read_subrequests(struct netfs_io_request *rreq) 
	 * up to the first permanently failed one.

	 */

	if (!rreq->netfs_ops->prepare_read &&

	    !test_bit(NETFS_RREQ_COPY_TO_CACHE, &rreq->flags)) {

	    !rreq->cache_resources.ops) {

		struct netfs_io_subrequest *subreq;



		list_for_each_entry(subreq, &rreq->subrequests, rreq_link) {

include/linux/netfs.h

+0 −1
Original line number Diff line number Diff line
@@ -269,7 +269,6 @@ struct netfs_io_request { 
	size_t			prev_donated;	/* Fallback for subreq->prev_donated */

	refcount_t		ref;

	unsigned long		flags;

#define NETFS_RREQ_COPY_TO_CACHE	1	/* Need to write to the cache */

#define NETFS_RREQ_NO_UNLOCK_FOLIO	2	/* Don't unlock no_unlock_folio on completion */

#define NETFS_RREQ_DONT_UNLOCK_FOLIOS	3	/* Don't unlock the folios on completion */

#define NETFS_RREQ_FAILED		4	/* The request failed */