From: ChenXiaoSong <chenxiaosong2@huawei.com>
Date: Wed, 18 May 2022 14:56:49 +0000 (+0800)
Subject: cifs: return the more nuanced writeback error on close()
X-Git-Tag: v5.19-rc1~113^2~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2b058acecf56f6b8fac781911a683219b9ca3b7b;p=thirdparty%2Fkernel%2Flinux.git

cifs: return the more nuanced writeback error on close()

As filemap_check_errors() only report -EIO or -ENOSPC, we return more nuanced
writeback error -(file->f_mapping->wb_err & MAX_ERRNO).

  filemap_write_and_wait
    filemap_write_and_wait_range
      filemap_check_errors
        -ENOSPC or -EIO
  filemap_check_wb_err
    errseq_check
      return -(file->f_mapping->wb_err & MAX_ERRNO)

Signed-off-by: ChenXiaoSong <chenxiaosong2@huawei.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
---

diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index 03f217fa490d1..89ebfee5c91c6 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -2777,8 +2777,11 @@ int cifs_flush(struct file *file, fl_owner_t id)
 		rc = filemap_write_and_wait(inode->i_mapping);
 
 	cifs_dbg(FYI, "Flush inode %p file %p rc %d\n", inode, file, rc);
-	if (rc)
+	if (rc) {
+		/* get more nuanced writeback errors */
+		rc = filemap_check_wb_err(file->f_mapping, 0);
 		trace_cifs_flush_err(inode->i_ino, rc);
+	}
 	return rc;
 }