projects
/
linux-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net: force bridge module(s) to be GPL
[linux-block.git]
/
block
/
deadline-iosched.c
diff --git
a/block/deadline-iosched.c
b/block/deadline-iosched.c
index c4d991d4adef0e7fd6e0d432941b88771d7c6530..b547cbca7b23a55dd9d1f0b444bed07d297fc646 100644
(file)
--- a/
block/deadline-iosched.c
+++ b/
block/deadline-iosched.c
@@
-138,7
+138,7
@@
deadline_merge(struct request_queue *q, struct request **req, struct bio *bio)
__rq = elv_rb_find(&dd->sort_list[bio_data_dir(bio)], sector);
if (__rq) {
__rq = elv_rb_find(&dd->sort_list[bio_data_dir(bio)], sector);
if (__rq) {
- BUG_ON(sector !=
__rq->sector
);
+ BUG_ON(sector !=
blk_rq_pos(__rq)
);
if (elv_rq_merge_ok(__rq, bio)) {
ret = ELEVATOR_FRONT_MERGE;
if (elv_rq_merge_ok(__rq, bio)) {
ret = ELEVATOR_FRONT_MERGE;