Skip to content

Commit

Permalink
block: revert "bsg: setting rq->bio to NULL"
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
FUJITA Tomonori authored and James Bottomley committed Jun 21, 2009
1 parent 93bdcba commit 1119865
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions block/bsg.c
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,6 @@ bsg_map_hdr(struct bsg_device *bd, struct sg_io_v4 *hdr, fmode_t has_write_perm,
blk_put_request(rq);
if (next_rq) {
blk_rq_unmap_user(next_rq->bio);
next_rq->bio = NULL;
blk_put_request(next_rq);
}
return ERR_PTR(ret);
Expand Down Expand Up @@ -449,7 +448,6 @@ static int blk_complete_sgv4_hdr_rq(struct request *rq, struct sg_io_v4 *hdr,
hdr->dout_resid = rq->resid_len;
hdr->din_resid = rq->next_rq->resid_len;
blk_rq_unmap_user(bidi_bio);
rq->next_rq->bio = NULL;
blk_put_request(rq->next_rq);
} else if (rq_data_dir(rq) == READ)
hdr->din_resid = rq->resid_len;
Expand All @@ -468,7 +466,6 @@ static int blk_complete_sgv4_hdr_rq(struct request *rq, struct sg_io_v4 *hdr,
blk_rq_unmap_user(bio);
if (rq->cmd != rq->__cmd)
kfree(rq->cmd);
rq->bio = NULL;
blk_put_request(rq);

return ret;
Expand Down

0 comments on commit 1119865

Please sign in to comment.