X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=block%2Fblk-merge.c;h=e39cb24b76792ad50d575ee88dcd440697c69074;hb=930861c4e6f13ce2e7d06cd1ef11441a065517d9;hp=5a244f05360f5ca67592e29a7270f3874bf16c37;hpb=b5c784894c90042f4fc6348aedc7524e899df281;p=pandora-kernel.git

diff --git a/block/blk-merge.c b/block/blk-merge.c
index 5a244f05360f..e39cb24b7679 100644
--- a/block/blk-merge.c
+++ b/block/blk-merge.c
@@ -403,6 +403,8 @@ static int attempt_merge(struct request_queue *q, struct request *req,
 	if (blk_rq_cpu_valid(next))
 		req->cpu = next->cpu;
 
+	/* owner-ship of bio passed from next to req */
+	next->bio = NULL;
 	__blk_put_request(q, next);
 	return 1;
 }