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

Commit ff8e0070 authored by Kent Overstreet's avatar Kent Overstreet
Browse files

pktcdvd: Use bio_reset() in disabled code to kill bi_idx usage 



In the short term this'll help with code auditing, and if this code ever
gets used now it's converted :)

Signed-off-by: default avatarKent Overstreet <koverstreet@google.com>
CC: Jiri Kosina <jkosina@suse.cz>
parent ffb25dc6

drivers/block/pktcdvd.c

+8 −9
Original line number Diff line number Diff line
@@ -1156,16 +1156,15 @@ static int pkt_start_recovery(struct packet_data *pkt) 
	new_sector = new_block * (CD_FRAMESIZE >> 9);

	pkt->sector = new_sector;



	bio_reset(pkt->bio);

	pkt->bio->bi_bdev = pd->bdev;

	pkt->bio->bi_rw = REQ_WRITE;

	pkt->bio->bi_sector = new_sector;

	pkt->bio->bi_next = NULL;

	pkt->bio->bi_flags = 1 << BIO_UPTODATE;

	pkt->bio->bi_idx = 0;



	BUG_ON(pkt->bio->bi_rw != REQ_WRITE);

	BUG_ON(pkt->bio->bi_vcnt != pkt->frames);

	BUG_ON(pkt->bio->bi_size != pkt->frames * CD_FRAMESIZE);

	BUG_ON(pkt->bio->bi_end_io != pkt_end_io_packet_write);

	BUG_ON(pkt->bio->bi_private != pkt);

	pkt->bio->bi_size = pkt->frames * CD_FRAMESIZE;

	pkt->bio->bi_vcnt = pkt->frames;



	pkt->bio->bi_end_io = pkt_end_io_packet_write;

	pkt->bio->bi_private = pkt;



	drop_super(sb);

	return 1;