On Jun 13, 2017, at 11:15 AM, Jens Axboe <axboe@xxxxxxxxx> wrote:
>
> Signed-off-by: Jens Axboe <axboe@xxxxxxxxx>
Reviewed-by: Andreas Dilger <adilger@xxxxxxxxx>
> ---
> fs/buffer.c | 14 +++++++++-----
> fs/mpage.c | 1 +
> 2 files changed, 10 insertions(+), 5 deletions(-)
>
> diff --git a/fs/buffer.c b/fs/buffer.c
> index 161be58c5cb0..8324c24751ca 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);
> + unsigned int stream, 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_streamid(inode), wbc);
> nr_underway++;
> }
> bh = next;
> @@ -1883,7 +1884,8 @@ int __block_write_full_page(struct inode *inode, struct page *page,
> 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_streamid(inode), wbc);
> nr_underway++;
> }
> bh = next;
> @@ -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)
> + unsigned int stream, struct writeback_control *wbc)
> {
> struct bio *bio;
>
> @@ -3130,6 +3132,8 @@ static int submit_bh_wbc(int op, int op_flags, struct buffer_head *bh,
> /* Take care of bh's that straddle the end of the device */
> guard_bio_eod(op, bio);
>
> + bio_set_streamid(bio, stream);
> +
> if (buffer_meta(bh))
> op_flags |= REQ_META;
> if (buffer_prio(bh))
> @@ -3142,7 +3146,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);
>
> diff --git a/fs/mpage.c b/fs/mpage.c
> index baff8f820c29..a9d40c0c053e 100644
> --- a/fs/mpage.c
> +++ b/fs/mpage.c
> @@ -614,6 +614,7 @@ static int __mpage_writepage(struct page *page, struct writeback_control *wbc,
> goto confused;
>
> wbc_init_bio(wbc, bio);
> + bio_set_streamid(bio, inode_streamid(inode));
> }
>
> /*
> --
> 2.7.4
>
Cheers, Andreas
Attachment:
signature.asc
Description: Message signed with OpenPGP
