---

yaml --- r: 251168 b: refs/heads/master c: 95cf3dd h: refs/heads/master v: v3
git-mirror · May 23, 2011 · 318f013 · 318f013
1 parent 161f108
commit 318f013
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 317389a7739675aa990b7e0d750a7c435f1d25d7
+refs/heads/master: 95cf3dd9dbe6883a0328724e2110e3fc6465630b
diff --git a/trunk/block/blk-core.c b/trunk/block/blk-core.c
@@ -1122,6 +1122,7 @@ static bool bio_attempt_back_merge(struct request_queue *q, struct request *req,
 	req->ioprio = ioprio_best(req->ioprio, bio_prio(bio));
 
 	drive_stat_acct(req, 0);
+	elv_bio_merged(q, req, bio);
 	return true;
 }
 
@@ -1155,6 +1156,7 @@ static bool bio_attempt_front_merge(struct request_queue *q,
 	req->ioprio = ioprio_best(req->ioprio, bio_prio(bio));
 
 	drive_stat_acct(req, 0);
+	elv_bio_merged(q, req, bio);
 	return true;
 }