Merge tag 'docs-4.13' of git://git.lwn.net/linux

[sfrench/cifs-2.6.git] / fs / mpage.c

diff --git a/fs/mpage.c b/fs/mpage.c
index 4760a0c09a4e3f108061edb2d6b53d82a3e58dc5..2e4c41ccb5c91a4824465678215d190e228134e6 100644 (file)
--- a/fs/mpage.c
+++ b/fs/mpage.c
@@ -50,7 +50,8 @@ static void mpage_end_io(struct bio *bio)
 
        bio_for_each_segment_all(bv, bio, i) {
                struct page *page = bv->bv_page;
-               page_endio(page, op_is_write(bio_op(bio)), bio->bi_error);
+               page_endio(page, op_is_write(bio_op(bio)),
+                               blk_status_to_errno(bio->bi_status));
        }
 
        bio_put(bio);
@@ -615,6 +616,7 @@ alloc_new:
                        goto confused;
 
                wbc_init_bio(wbc, bio);
+               bio->bi_write_hint = inode->i_write_hint;
        }
 
        /*