diff options
author | Ming Lei <ming.lei@canonical.com> | 2015-11-23 21:35:31 -0500 |
---|---|---|
committer | Jens Axboe <axboe@fb.com> | 2015-11-23 22:16:55 -0500 |
commit | 12e57f59ca3344a588531f68eeede45666e8a6e0 (patch) | |
tree | ab7fae19d98f36118ba64fd12eef25a23c47c65f | |
parent | 02e707424c2eadbcda68cd38876c9f4434ca8e1a (diff) |
blk-merge: warn if figured out segment number is bigger than nr_phys_segments
We had seen lots of reports of this kind issue, so add one
warnning in blk-merge, then it can be triggered easily and
avoid to depend on warning/bug from drivers.
Signed-off-by: Ming Lei <ming.lei@canonical.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
-rw-r--r-- | block/blk-merge.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/block/blk-merge.c b/block/blk-merge.c index 50793cdc5331..41a55ba0d78e 100644 --- a/block/blk-merge.c +++ b/block/blk-merge.c | |||
@@ -428,6 +428,12 @@ int blk_rq_map_sg(struct request_queue *q, struct request *rq, | |||
428 | if (sg) | 428 | if (sg) |
429 | sg_mark_end(sg); | 429 | sg_mark_end(sg); |
430 | 430 | ||
431 | /* | ||
432 | * Something must have been wrong if the figured number of | ||
433 | * segment is bigger than number of req's physical segments | ||
434 | */ | ||
435 | WARN_ON(nsegs > rq->nr_phys_segments); | ||
436 | |||
431 | return nsegs; | 437 | return nsegs; |
432 | } | 438 | } |
433 | EXPORT_SYMBOL(blk_rq_map_sg); | 439 | EXPORT_SYMBOL(blk_rq_map_sg); |