Commit 852ad96c authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

pktcdvd: stop using bio_reset 



Just initialize the bios on-demand.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20220406061228.410163-6-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 066ff571

drivers/block/pktcdvd.c

+9 −16
Original line number Diff line number Diff line
@@ -525,7 +525,6 @@ static struct packet_data *pkt_alloc_packet_data(int frames) 
	pkt->w_bio = bio_kmalloc(frames, GFP_KERNEL);

	if (!pkt->w_bio)

		goto no_bio;

	bio_init(pkt->w_bio, NULL, pkt->w_bio->bi_inline_vecs, frames, 0);



	for (i = 0; i < frames / FRAMES_PER_PAGE; i++) {

		pkt->pages[i] = alloc_page(GFP_KERNEL|__GFP_ZERO);
@@ -537,26 +536,20 @@ static struct packet_data *pkt_alloc_packet_data(int frames) 
	bio_list_init(&pkt->orig_bios);



	for (i = 0; i < frames; i++) {

		struct bio *bio = bio_kmalloc(1, GFP_KERNEL);

		if (!bio)

		pkt->r_bios[i] = bio_kmalloc(1, GFP_KERNEL);

		if (!pkt->r_bios[i])

			goto no_rd_bio;

		bio_init(bio, NULL, bio->bi_inline_vecs, 1, 0);

		pkt->r_bios[i] = bio;

	}



	return pkt;



no_rd_bio:

	for (i = 0; i < frames; i++) {

		if (pkt->r_bios[i])

			bio_uninit(pkt->r_bios[i]);

	for (i = 0; i < frames; i++)

		kfree(pkt->r_bios[i]);

	}

no_page:

	for (i = 0; i < frames / FRAMES_PER_PAGE; i++)

		if (pkt->pages[i])

			__free_page(pkt->pages[i]);

	bio_uninit(pkt->w_bio);

	kfree(pkt->w_bio);

no_bio:

	kfree(pkt);
@@ -571,13 +564,10 @@ static void pkt_free_packet_data(struct packet_data *pkt) 
{

	int i;



	for (i = 0; i < pkt->frames; i++) {

		bio_uninit(pkt->r_bios[i]);

	for (i = 0; i < pkt->frames; i++)

		kfree(pkt->r_bios[i]);

	}

	for (i = 0; i < pkt->frames / FRAMES_PER_PAGE; i++)

		__free_page(pkt->pages[i]);

	bio_uninit(pkt->w_bio);

	kfree(pkt->w_bio);

	kfree(pkt);

}
@@ -952,6 +942,7 @@ static void pkt_end_io_read(struct bio *bio) 


	if (bio->bi_status)

		atomic_inc(&pkt->io_errors);

	bio_uninit(bio);

	if (atomic_dec_and_test(&pkt->io_wait)) {

		atomic_inc(&pkt->run_sm);

		wake_up(&pd->wqueue);
@@ -969,6 +960,7 @@ static void pkt_end_io_packet_write(struct bio *bio) 


	pd->stats.pkt_ended++;



	bio_uninit(bio);

	pkt_bio_finished(pd);

	atomic_dec(&pkt->io_wait);

	atomic_inc(&pkt->run_sm);
@@ -1023,7 +1015,7 @@ static void pkt_gather_data(struct pktcdvd_device *pd, struct packet_data *pkt) 
			continue;



		bio = pkt->r_bios[f];

		bio_reset(bio, pd->bdev, REQ_OP_READ);

		bio_init(bio, pd->bdev, bio->bi_inline_vecs, 1, REQ_OP_READ);

		bio->bi_iter.bi_sector = pkt->sector + f * (CD_FRAMESIZE >> 9);

		bio->bi_end_io = pkt_end_io_read;

		bio->bi_private = pkt;
@@ -1236,7 +1228,8 @@ static void pkt_start_write(struct pktcdvd_device *pd, struct packet_data *pkt) 
{

	int f;



	bio_reset(pkt->w_bio, pd->bdev, REQ_OP_WRITE);

	bio_init(pkt->w_bio, pd->bdev, pkt->w_bio->bi_inline_vecs, pkt->frames,

		 REQ_OP_WRITE);

	pkt->w_bio->bi_iter.bi_sector = pkt->sector;

	pkt->w_bio->bi_end_io = pkt_end_io_packet_write;

	pkt->w_bio->bi_private = pkt;