fs: move guard_bio_eod() after bio_set_op_attrs
Subsystems (2)
PATCH 1/1 fs: move guard_bio_eod() after bio_set_op_attrs
Commit 85a8ce62c2ea ("block: add bio_truncate to fix guard_bio_eod") adds bio_truncate() for handling bio EOD. However, bio_truncate() doesn't use the passed 'op' parameter from guard_bio_eod's callers.
So bio_trunacate() may retrieve wrong 'op', and zering pages may not be done for READ bio.
Fixes this issue by moving guard_bio_eod() after bio_set_op_attrs() in submit_bh_wbc() so that bio_truncate() can always retrieve correct op info.
Meantime remove the 'op' parameter from guard_bio_eod() because it isn't used any more.
--- fs/buffer.c | 8 ++++---- fs/internal.h | 2 +- fs/mpage.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-)
fs/buffer.c +4 -4
@@ -3031,7 +3031,7 @@ static void end_bio_bh_io_sync(struct bio *bio)* errors, this only handles the "we need to be able to * do IO at the final sector" case. */ -void guard_bio_eod (int op,struct bio *bio) +void guard_bio_eod (struct bio *bio) {sector_t maxsector;struct hd_struct *part;
@@ -3095,15 +3095,15 @@ static int submit_bh_wbc(int op, int op_flags, struct buffer_head *bh, bio->bi_end_io = end_bio_bh_io_sync; bio->bi_private = bh; -/* Take care of bh's that straddle the end of the device */ -guard_bio_eod (op, bio); -if (buffer_meta (bh)) op_flags |=REQ_META ;if (buffer_prio (bh)) op_flags |=REQ_PRIO ;bio_set_op_attrs (bio, op, op_flags); +/* Take care of bh's that straddle the end of the device */ +guard_bio_eod (bio); +if (wbc) {wbc_init_bio (wbc, bio);wbc_account_cgroup_owner (wbc, bh->b_page, bh->b_size);
fs/internal.h +1 -1
@@ -38,7 +38,7 @@ static inline int __sync_blockdev(struct block_device *bdev, int wait)/* * buffer.c */ -extern void guard_bio_eod (int rw,struct bio *bio); +extern void guard_bio_eod (struct bio *bio);extern int __block_write_begin_int (struct page *page,loff_t pos,unsigned len,get_block_t *get_block,struct iomap *iomap);
fs/mpage.c +1 -1
@@ -62,7 +62,7 @@ static struct bio *mpage_bio_submit(int op, int op_flags, struct bio *bio) { bio->bi_end_io = mpage_end_io;bio_set_op_attrs (bio, op, op_flags); -guard_bio_eod (op, bio); +guard_bio_eod (bio);submit_bio (bio);return NULL ; }
Signature · 1 line
2.20.1
Jens Axboe
maintainerQuoted 7 lines · Ming Lei
Commit
85a8ce62c2ea("block: addbio_truncateto fixguard_bio_eod") addsbio_truncate()for handling bio EOD. However,bio_truncate()doesn't use the passed 'op' parameter from guard_bio_eod's callers.So
bio_trunacate()may retrieve wrong 'op', and zering pages may not be done for READ bio.
Quoted 6 lines
Fixes this issue by moving
guard_bio_eod()afterbio_set_op_attrs()insubmit_bh_wbc()so thatbio_truncate()can always retrieve correct op info.Meantime remove the 'op' parameter from
guard_bio_eod()because it isn't used any more.
I'll queue this up, since the previous fix went through the block tree.
Signature · 1 line
Jens Axboe