Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
bsg: setting rq->bio to NULL

Changed files
+3
block
+3
block/bsg.c
··· 315 315 blk_put_request(rq); 316 316 if (next_rq) { 317 317 blk_rq_unmap_user(next_rq->bio); 318 + next_rq->bio = NULL; 318 319 blk_put_request(next_rq); 319 320 } 320 321 return ERR_PTR(ret); ··· 449 448 hdr->dout_resid = rq->data_len; 450 449 hdr->din_resid = rq->next_rq->data_len; 451 450 blk_rq_unmap_user(bidi_bio); 451 + rq->next_rq->bio = NULL; 452 452 blk_put_request(rq->next_rq); 453 453 } else if (rq_data_dir(rq) == READ) 454 454 hdr->din_resid = rq->data_len; ··· 468 466 blk_rq_unmap_user(bio); 469 467 if (rq->cmd != rq->__cmd) 470 468 kfree(rq->cmd); 469 + rq->bio = NULL; 471 470 blk_put_request(rq); 472 471 473 472 return ret;