Commit 46f5cbde authored by David Howells's avatar David Howells Committed by Steve French
Browse files

cifs: Fix the readahead conversion to manage the batch when reading from cache 



Fix the readahead conversion to correctly manage the last batch skipping
when reading from cache.  This involves a readahead batch of one page or
one folio, so set the batch size according to the number of constituent
pages (should be 1 for a filesystem that doesn't do multipage folios yet).

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
cc: Steve French <smfrench@gmail.com>
Reviewed-by: default avatarRohith Surabattula <rohiths.msft@gmail.com>
Reviewed-by: default avatarShyam Prasad N <nspmangalore@gmail.com>
cc: Jeff Layton <jlayton@kernel.org>
cc: linux-cifs@vger.kernel.org
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent 0174ee99

fs/cifs/file.c

+1 −1
Original line number Diff line number Diff line
@@ -4446,7 +4446,7 @@ static void cifs_readahead(struct readahead_control *ractl) 
				 * by the cache.

				 */

				page = readahead_page(ractl);



				last_batch_size = 1 << thp_order(page);

				if (cifs_readpage_from_fscache(ractl->mapping->host,

							       page) < 0) {

					/*