projects
/
platform
/
kernel
/
linux-starfive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'drm-nouveau-fixes-3.10' of git://anongit.freedesktop.org/git/nouveau...
[platform/kernel/linux-starfive.git]
/
block
/
deadline-iosched.c
diff --git
a/block/deadline-iosched.c
b/block/deadline-iosched.c
index
90037b5
..
ba19a3a
100644
(file)
--- a/
block/deadline-iosched.c
+++ b/
block/deadline-iosched.c
@@
-132,7
+132,7
@@
deadline_merge(struct request_queue *q, struct request **req, struct bio *bio)
* check for front merge
*/
if (dd->front_merges) {
- sector_t sector = bio
->bi_sector + bio_sectors
(bio);
+ sector_t sector = bio
_end_sector
(bio);
__rq = elv_rb_find(&dd->sort_list[bio_data_dir(bio)], sector);
if (__rq) {