diff options
| author | David Howells <dhowells@redhat.com> | 2024-12-16 21:34:45 +0100 |
|---|---|---|
| committer | Christian Brauner <brauner@kernel.org> | 2024-12-20 22:07:58 +0100 |
| commit | d4e338de17cb6532bf805fae00db8b41e914009b (patch) | |
| tree | cd764e0e14cf605fdad2677f45a50408e57dac81 /fs | |
| parent | netfs: Fix the (non-)cancellation of copy when cache is temporarily disabled (diff) | |
| download | linux-d4e338de17cb6532bf805fae00db8b41e914009b.tar.xz linux-d4e338de17cb6532bf805fae00db8b41e914009b.zip | |
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: ee4cdf7ba857 ("netfs: Speed up buffered reading")
Signed-off-by: David 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: Christian Brauner <brauner@kernel.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/netfs/read_retry.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/netfs/read_retry.c b/fs/netfs/read_retry.c index 0e72e9226fc8..21b4a54e545e 100644 --- a/fs/netfs/read_retry.c +++ b/fs/netfs/read_retry.c @@ -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) { |