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

netfs: Fix read-retry for fs with no ->prepare_read() 



Fix netfslib's read-retry to only call ->prepare_read() in the backing
filesystem such a function is provided.  We can get to this point if a
there's an active cache as failed reads from the cache need negotiating
with the server instead.

Fixes: ee4cdf7b ("netfs: Speed up buffered reading")
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Link: https://lore.kernel.org/r/529329.1736261010@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 3f6bc9e3

fs/netfs/read_retry.c

+2 −1
Original line number Diff line number Diff line
@@ -152,7 +152,8 @@ static void netfs_retry_read_subrequests(struct netfs_io_request *rreq) 
			BUG_ON(!len);



			/* Renegotiate max_len (rsize) */

			if (rreq->netfs_ops->prepare_read(subreq) < 0) {

			if (rreq->netfs_ops->prepare_read &&

			    rreq->netfs_ops->prepare_read(subreq) < 0) {

				trace_netfs_sreq(subreq, netfs_sreq_trace_reprep_failed);

				__set_bit(NETFS_SREQ_FAILED, &subreq->flags);

			}