diff options
| author | Ming Lei <ming.lei@redhat.com> | 2020-01-05 09:41:14 +0800 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2020-01-09 08:16:12 -0700 |
| commit | 83c9c547168e8b914ea6398430473a4de68c52cc (patch) | |
| tree | 9134fc796f74f44136d488d92ab270f9b1cdf788 /fs/mpage.c | |
| parent | 57415790f405534e5578d0106d806630c325dcb3 (diff) | |
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.
Cc: Carlos Maiolino <cmaiolino@redhat.com>
Cc: linux-fsdevel@vger.kernel.org
Fixes: 85a8ce62c2ea ("block: add bio_truncate to fix guard_bio_eod")
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Fold in kerneldoc and bio_op() change.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'fs/mpage.c')
| -rw-r--r-- | fs/mpage.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/mpage.c b/fs/mpage.c index a63620cdb73a..ccba3c4c4479 100644 --- a/fs/mpage.c +++ b/fs/mpage.c @@ -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; } |