Skip to contentSkip to conversation

block fix for 2.6.30

GIT PULL Jens Axboe 1 participant 1 message Jun 9, 2009

Subsystems (3)
SCSI Block layer BSG (block layer generic sg v4 driver)
lore
Share & tools
lore

Jens Axboe

author
#0 lore raw

Hi Linus,

Just a single fix, fixes a bad warning caused by some debug code that triggers for a non-problem. Please pull for 2.6.30!

git://git.kernel.dk/linux-2.6-block.git for-linus

FUJITA Tomonori (1):

      bsg: setting rq->bio to NULL
 block/bsg.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
block/bsg.c +3 -0
index 206060e..dd81be4 100644
@@ -315,6 +315,7 @@ out:
 	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);

@@ -448,6 +449,7 @@ static int blk_complete_sgv4_hdr_rq(struct request *rq, struct sg_io_v4 *hdr,
 		hdr->dout_resid = rq->data_len;
 		hdr->din_resid = rq->next_rq->data_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->data_len;

@@ -466,6 +468,7 @@ 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;
Signature · 1 line
Jens Axboe