From 812ffba3b83c86bba38fd087fa41fe2f08f7acb6 Mon Sep 17 00:00:00 2001 From: Trond Myklebust Date: Wed, 12 Jun 2019 21:53:33 +0800 Subject: [PATCH] NFS: Don't interrupt file writeout due to fatal errors mainline inclusion from mainline-v5.2-rc1 commit 14bebe3c90b326d2a0df78aed5e9de090c71d878 category: bugfix bugzilla: 15379 CVE: NA ------------------------------------------------- When flushing out dirty pages, the fact that we may hit fatal errors is not a reason to stop writeback. Those errors are reported through fsync(), not through the flush mechanism. Fixes: a6598813a4c5b ("NFS: Don't write back further requests if there...") Signed-off-by: Trond Myklebust Signed-off-by: Anna Schumaker Signed-off-by: ZhangXiaoxu Reviewed-by: yangerkun Signed-off-by: Yang Yingliang --- fs/nfs/write.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/nfs/write.c b/fs/nfs/write.c index 51d0b7913c04..d78d32027c71 100644 --- a/fs/nfs/write.c +++ b/fs/nfs/write.c @@ -646,7 +646,7 @@ static int nfs_page_async_flush(struct nfs_pageio_descriptor *pgio, return ret; out_launder: nfs_write_error_remove_page(req); - return ret; + return 0; } static int nfs_do_writepage(struct page *page, struct writeback_control *wbc, -- GitLab