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

Commit 11198659 authored by FUJITA Tomonori's avatar FUJITA Tomonori Committed by James Bottomley
Browse files

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: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent 93bdcba5

block/bsg.c

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