1 files changed, 9 insertions, 6 deletions

diff --git a/fs/buffer.c b/fs/buffer.c
index 161be58c5cb0..5c2cba8d2387 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -49,7 +49,7 @@
 
 static int fsync_buffers_list(spinlock_t *lock, struct list_head *list);
 static int submit_bh_wbc(int op, int op_flags, struct buffer_head *bh,
-                         struct writeback_control *wbc);
+                         enum rw_hint hint, struct writeback_control *wbc);
 
 #define BH_ENTRY(list) list_entry((list), struct buffer_head, b_assoc_buffers)
 
@@ -1829,7 +1829,8 @@ int __block_write_full_page(struct inode *inode, struct page *page,
         do {
                 struct buffer_head *next = bh->b_this_page;
                 if (buffer_async_write(bh)) {
-                        submit_bh_wbc(REQ_OP_WRITE, write_flags, bh, wbc);
+                        submit_bh_wbc(REQ_OP_WRITE, write_flags, bh,
+                                        inode->i_write_hint, wbc);
                         nr_underway++;
                 }
                 bh = next;
@@ -1883,7 +1884,8 @@ recover:
                 struct buffer_head *next = bh->b_this_page;
                 if (buffer_async_write(bh)) {
                         clear_buffer_dirty(bh);
-                        submit_bh_wbc(REQ_OP_WRITE, write_flags, bh, wbc);
+                        submit_bh_wbc(REQ_OP_WRITE, write_flags, bh,
+                                        inode->i_write_hint, wbc);
                         nr_underway++;
                 }
                 bh = next;
@@ -3038,7 +3040,7 @@ static void end_bio_bh_io_sync(struct bio *bio)
         if (unlikely(bio_flagged(bio, BIO_QUIET)))
                 set_bit(BH_Quiet, &bh->b_state);
 
-        bh->b_end_io(bh, !bio->bi_error);
+        bh->b_end_io(bh, !bio->bi_status);
         bio_put(bio);
 }
 
@@ -3091,7 +3093,7 @@ void guard_bio_eod(int op, struct bio *bio)
 }
 
 static int submit_bh_wbc(int op, int op_flags, struct buffer_head *bh,
-                         struct writeback_control *wbc)
+                         enum rw_hint write_hint, struct writeback_control *wbc)
 {
         struct bio *bio;
 
@@ -3120,6 +3122,7 @@ static int submit_bh_wbc(int op, int op_flags, struct buffer_head *bh,
 
         bio->bi_iter.bi_sector = bh->b_blocknr * (bh->b_size >> 9);
         bio->bi_bdev = bh->b_bdev;
+        bio->bi_write_hint = write_hint;
 
         bio_add_page(bio, bh->b_page, bh->b_size, bh_offset(bh));
         BUG_ON(bio->bi_iter.bi_size != bh->b_size);
@@ -3142,7 +3145,7 @@ static int submit_bh_wbc(int op, int op_flags, struct buffer_head *bh,
 
 int submit_bh(int op, int op_flags, struct buffer_head *bh)
 {
-        return submit_bh_wbc(op, op_flags, bh, NULL);
+        return submit_bh_wbc(op, op_flags, bh, 0, NULL);
 }
 EXPORT_SYMBOL(submit_bh);