[RESEND] NFS: Read unlock folio on nfs_page_create_from_folio() error

Commit Message

Benjamin Coddington March 7, 2024, 2:41 p.m. UTC

The netfs conversion lost a folio_unlock() for the case where
nfs_page_create_from_folio() returns an error (usually -ENOMEM).  Restore
it.

Reported-by: David Jeffery <[e-mail]>
Cc: <[e-mail]> # 6.4+
Fixes: 000dbe0bec05 ("NFS: Convert buffered read paths to use netfs when fscache is enabled")
Signed-off-by: Benjamin Coddington <[e-mail]>
---

Resending this as I messed up Trond's email address on the first try:
https://lore.kernel.org/linux-nfs/[e-mail]/T/#t

---
 fs/nfs/read.c | 2 ++
 1 file changed, 2 insertions(+)

Patch

diff --git a/fs/nfs/read.c b/fs/nfs/read.c
index 7dc21a48e3e7..a142287d86f6 100644
--- a/fs/nfs/read.c
+++ b/fs/nfs/read.c
@@ -305,6 +305,8 @@  int nfs_read_add_folio(struct nfs_pageio_descriptor *pgio,
 	new = nfs_page_create_from_folio(ctx, folio, 0, aligned_len);
 	if (IS_ERR(new)) {
 		error = PTR_ERR(new);
+		if (nfs_netfs_folio_unlock(folio))
+			folio_unlock(folio);
 		goto out;
 	}