From c5f059953e947dd7f68306ef0d87e3e8b3c8e17e Mon Sep 17 00:00:00 2001 From: FUJITA Tomonori Date: Wed, 17 Jun 2009 15:10:11 +0900 Subject: [PATCH] --- yaml --- r: 154021 b: refs/heads/master c: 111986593561fc4c94a1fba3f3cd84476fb40b22 h: refs/heads/master i: 154019: 09a5d1d14a03786879c4ce3683f9d3b21fa1ad35 v: v3 --- [refs] | 2 +- trunk/block/bsg.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 63f4386e5d9b..9adee23b22f2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 93bdcba5a7e55307e27671594c3cd8b4669b9e7a +refs/heads/master: 111986593561fc4c94a1fba3f3cd84476fb40b22 diff --git a/trunk/block/bsg.c b/trunk/block/bsg.c index 54106f052f70..e7d475254248 100644 --- a/trunk/block/bsg.c +++ b/trunk/block/bsg.c @@ -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); @@ -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; @@ -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;