Merge branch 'akpm' (patches from Andrew)

[linux-2.6-microblaze.git] / fs / dax.c

diff --git a/fs/dax.c b/fs/dax.c
index b1cd18d..306c2b6 100644 (file)
--- a/fs/dax.c
+++ b/fs/dax.c
@@ -855,8 +855,10 @@ int dax_writeback_mapping_range(struct address_space *mapping,
 
                        ret = dax_writeback_one(bdev, dax_dev, mapping,
                                        indices[i], pvec.pages[i]);
-                       if (ret < 0)
+                       if (ret < 0) {
+                               mapping_set_error(mapping, ret);
                                goto out;
+                       }
                }
                start_index = indices[pvec.nr - 1] + 1;
        }