diff options
author | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2009-06-17 02:10:11 -0400 |
---|---|---|
committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2009-06-21 11:52:42 -0400 |
commit | 111986593561fc4c94a1fba3f3cd84476fb40b22 (patch) | |
tree | 8af40a65c9d4a7abf0b6eaa461562b5a54f15dd2 | |
parent | 93bdcba5a7e55307e27671594c3cd8b4669b9e7a (diff) |
block: revert "bsg: setting rq->bio to NULL"
The SMP handler (sas_smp_request) was fixed to use the block API
properly, so we don't need this workaround to avoid blk_put_request()
warning.
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
-rw-r--r-- | block/bsg.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/block/bsg.c b/block/bsg.c index 54106f052f70..e7d475254248 100644 --- a/block/bsg.c +++ b/block/bsg.c | |||
@@ -315,7 +315,6 @@ out: | |||
315 | blk_put_request(rq); | 315 | blk_put_request(rq); |
316 | if (next_rq) { | 316 | if (next_rq) { |
317 | blk_rq_unmap_user(next_rq->bio); | 317 | blk_rq_unmap_user(next_rq->bio); |
318 | next_rq->bio = NULL; | ||
319 | blk_put_request(next_rq); | 318 | blk_put_request(next_rq); |
320 | } | 319 | } |
321 | return ERR_PTR(ret); | 320 | return ERR_PTR(ret); |
@@ -449,7 +448,6 @@ static int blk_complete_sgv4_hdr_rq(struct request *rq, struct sg_io_v4 *hdr, | |||
449 | hdr->dout_resid = rq->resid_len; | 448 | hdr->dout_resid = rq->resid_len; |
450 | hdr->din_resid = rq->next_rq->resid_len; | 449 | hdr->din_resid = rq->next_rq->resid_len; |
451 | blk_rq_unmap_user(bidi_bio); | 450 | blk_rq_unmap_user(bidi_bio); |
452 | rq->next_rq->bio = NULL; | ||
453 | blk_put_request(rq->next_rq); | 451 | blk_put_request(rq->next_rq); |
454 | } else if (rq_data_dir(rq) == READ) | 452 | } else if (rq_data_dir(rq) == READ) |
455 | hdr->din_resid = rq->resid_len; | 453 | hdr->din_resid = rq->resid_len; |
@@ -468,7 +466,6 @@ static int blk_complete_sgv4_hdr_rq(struct request *rq, struct sg_io_v4 *hdr, | |||
468 | blk_rq_unmap_user(bio); | 466 | blk_rq_unmap_user(bio); |
469 | if (rq->cmd != rq->__cmd) | 467 | if (rq->cmd != rq->__cmd) |
470 | kfree(rq->cmd); | 468 | kfree(rq->cmd); |
471 | rq->bio = NULL; | ||
472 | blk_put_request(rq); | 469 | blk_put_request(rq); |
473 | 470 | ||
474 | return ret; | 471 | return ret; |