Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 95cf3dd9dbe6883a0328724e2110e3fc6465630b

Authored by Vivek Goyal
Committed by Jens Axboe
1 parent 317389a773
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

block: call elv_bio_merged() when merged 

Commit 73c101011926 ("block: initial patch for on-stack per-task plugging")
removed calls to elv_bio_merged() when @bio merged with @req. Re-add them.

This in turn will update merged stats in associated group. That
should be safe as long as request has got reference to the blkio_group.

Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Cc: Divyesh Shah <dpshah@google.com>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>

Showing 1 changed file with 2 additions and 0 deletions Side-by-side Diff

... ... @@ -1122,6 +1122,7 @@
1122 1122 req->ioprio = ioprio_best(req->ioprio, bio_prio(bio));
1123 1123  
1124 1124 drive_stat_acct(req, 0);
  1125 + elv_bio_merged(q, req, bio);
1125 1126 return true;
1126 1127 }
1127 1128  
... ... @@ -1155,6 +1156,7 @@
1155 1156 req->ioprio = ioprio_best(req->ioprio, bio_prio(bio));
1156 1157  
1157 1158 drive_stat_acct(req, 0);
  1159 + elv_bio_merged(q, req, bio);
1158 1160 return true;
1159 1161 }
1160 1162