Commit c6f62f81 authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle) Committed by Steve French

cifs: Fix memory leak when using fscache

If we hit the 'index == next_cached' case, we leak a refcount on the
struct page.  Fix this by using readahead_folio() which takes care of
the refcount for you.

Fixes: 0174ee99 ("cifs: Implement cache I/O by accessing the cache directly")
Cc: David Howells <dhowells@redhat.com>
Cc: Jeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent 89e42f49
...@@ -4459,10 +4459,10 @@ static void cifs_readahead(struct readahead_control *ractl) ...@@ -4459,10 +4459,10 @@ static void cifs_readahead(struct readahead_control *ractl)
* TODO: Send a whole batch of pages to be read * TODO: Send a whole batch of pages to be read
* by the cache. * by the cache.
*/ */
page = readahead_page(ractl); struct folio *folio = readahead_folio(ractl);
last_batch_size = 1 << thp_order(page); last_batch_size = folio_nr_pages(folio);
if (cifs_readpage_from_fscache(ractl->mapping->host, if (cifs_readpage_from_fscache(ractl->mapping->host,
page) < 0) { &folio->page) < 0) {
/* /*
* TODO: Deal with cache read failure * TODO: Deal with cache read failure
* here, but for the moment, delegate * here, but for the moment, delegate
...@@ -4470,7 +4470,7 @@ static void cifs_readahead(struct readahead_control *ractl) ...@@ -4470,7 +4470,7 @@ static void cifs_readahead(struct readahead_control *ractl)
*/ */
caching = false; caching = false;
} }
unlock_page(page); folio_unlock(folio);
next_cached++; next_cached++;
cache_nr_pages--; cache_nr_pages--;
if (cache_nr_pages == 0) if (cache_nr_pages == 0)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment