From: Dave Wysochanski Date: Tue, 29 Jun 2021 09:11:28 +0000 (-0400) Subject: NFS: Ensure nfs_readpage returns promptly when internal error occurs X-Git-Tag: v5.14-rc1~38^2~7 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e0340f16a08d031de54ed91d26f57c9a966a776a;p=thirdparty%2Fkernel%2Flinux.git 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. Signed-off-by: Dave Wysochanski Signed-off-by: Trond Myklebust --- diff --git a/fs/nfs/read.c b/fs/nfs/read.c index 684a730f6670f..eb390eb618b30 100644 --- a/fs/nfs/read.c +++ b/fs/nfs/read.c @@ -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);