Skip to contentSkip to conversation

NFS: Ensure nfs_readpage returns promptly when internal error occurs

PATCH New Dave Wysochanski 1 participant 1 message Jun 29, 2021

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v2 2/4 NFS: Ensure nfs_readpage returns promptly when internal error occurs

A previous refactoring of nfs_readpage() might end up calling wait_on_page_locked_killable() even if readpage_async_filler() failed with an internal error and pg_error was non-zero (for example, if nfs_create_request() failed). In the case of an internal error, skip over wait_on_page_locked_killable() as this is only needed when the read is sent and an error occurs during completion handling.

---
 fs/nfs/read.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
fs/nfs/read.c +3 -3
index 684a730f6670..eb390eb618b3 100644
@@ -373,10 +373,10 @@ int nfs_readpage(struct file *file, struct page *page)
 			     &nfs_async_read_completion_ops);
 
 	ret = readpage_async_filler(&desc, page);
+	if (ret)
+		goto out;
 
-	if (!ret)
-		nfs_pageio_complete_read(&desc.pgio);
-
+	nfs_pageio_complete_read(&desc.pgio);
 	ret = desc.pgio.pg_error < 0 ? desc.pgio.pg_error : 0;
 	if (!ret) {
 		ret = wait_on_page_locked_killable(page);
Signature · 1 line
1.8.3.1