Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9cdba302 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents fd4d3429 c1d4c41f

block/bsg.c

+3 −0
Original line number Diff line number Diff line
@@ -315,6 +315,7 @@ 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);
@@ -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;