mm: clear AS_EIO/AS_ENOSPC when writeback initiation fails

[linux.git] / mm / filemap.c

diff --git a/mm/filemap.c b/mm/filemap.c
index e5711b2728f4f608f9977805797d1a22d8810191..49bc9720fb00bf22f126a0d28ed149f7ecdedb1d 100644 (file)
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -515,6 +515,9 @@ int filemap_write_and_wait(struct address_space *mapping)
                        int err2 = filemap_fdatawait(mapping);
                        if (!err)
                                err = err2;
+               } else {
+                       /* Clear any previously stored errors */
+                       filemap_check_errors(mapping);
                }
        } else {
                err = filemap_check_errors(mapping);
@@ -549,6 +552,9 @@ int filemap_write_and_wait_range(struct address_space *mapping,
                                                lstart, lend);
                        if (!err)
                                err = err2;
+               } else {
+                       /* Clear any previously stored errors */
+                       filemap_check_errors(mapping);
                }
        } else {
                err = filemap_check_errors(mapping);