Unverified Commit 7ac86df8 authored by Jan Kara's avatar Jan Kara Committed by Christian Brauner
Browse files

pktcdvd: Convert to bdev_open_by_dev() 



Convert pktcdvd to use bdev_open_by_dev().

Acked-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarChristian Brauner <brauner@kernel.org>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20230927093442.25915-5-jack@suse.cz


Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent 75e27d37

drivers/block/pktcdvd.c

+41 −35
Original line number Diff line number Diff line
@@ -340,8 +340,8 @@ static ssize_t device_map_show(const struct class *c, const struct class_attribu 
		n += sysfs_emit_at(data, n, "%s %u:%u %u:%u\n",

			pd->disk->disk_name,

			MAJOR(pd->pkt_dev), MINOR(pd->pkt_dev),

			MAJOR(pd->bdev->bd_dev),

			MINOR(pd->bdev->bd_dev));

			MAJOR(pd->bdev_handle->bdev->bd_dev),

			MINOR(pd->bdev_handle->bdev->bd_dev));

	}

	mutex_unlock(&ctl_mutex);

	return n;
@@ -437,7 +437,8 @@ static int pkt_seq_show(struct seq_file *m, void *p) 
	char *msg;

	int states[PACKET_NUM_STATES];



	seq_printf(m, "Writer %s mapped to %pg:\n", pd->disk->disk_name, pd->bdev);

	seq_printf(m, "Writer %s mapped to %pg:\n", pd->disk->disk_name,

		   pd->bdev_handle->bdev);



	seq_printf(m, "\nSettings:\n");

	seq_printf(m, "\tpacket size:\t\t%dkB\n", pd->settings.size / 2);
@@ -714,7 +715,7 @@ static void pkt_rbtree_insert(struct pktcdvd_device *pd, struct pkt_rb_node *nod 
 */

static int pkt_generic_packet(struct pktcdvd_device *pd, struct packet_command *cgc)

{

	struct request_queue *q = bdev_get_queue(pd->bdev);

	struct request_queue *q = bdev_get_queue(pd->bdev_handle->bdev);

	struct scsi_cmnd *scmd;

	struct request *rq;

	int ret = 0;
@@ -1047,7 +1048,8 @@ static void pkt_gather_data(struct pktcdvd_device *pd, struct packet_data *pkt) 
			continue;



		bio = pkt->r_bios[f];

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

		bio_init(bio, pd->bdev_handle->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;
@@ -1262,8 +1264,8 @@ static void pkt_start_write(struct pktcdvd_device *pd, struct packet_data *pkt) 
	struct device *ddev = disk_to_dev(pd->disk);

	int f;



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

		 REQ_OP_WRITE);

	bio_init(pkt->w_bio, pd->bdev_handle->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;
@@ -2160,18 +2162,20 @@ static int pkt_open_dev(struct pktcdvd_device *pd, bool write) 
	int ret;

	long lba;

	struct request_queue *q;

	struct block_device *bdev;

	struct bdev_handle *bdev_handle;



	/*

	 * We need to re-open the cdrom device without O_NONBLOCK to be able

	 * to read/write from/to it. It is already opened in O_NONBLOCK mode

	 * so open should not fail.

	 */

	bdev = blkdev_get_by_dev(pd->bdev->bd_dev, BLK_OPEN_READ, pd, NULL);

	if (IS_ERR(bdev)) {

		ret = PTR_ERR(bdev);

	bdev_handle = bdev_open_by_dev(pd->bdev_handle->bdev->bd_dev,

				       BLK_OPEN_READ, pd, NULL);

	if (IS_ERR(bdev_handle)) {

		ret = PTR_ERR(bdev_handle);

		goto out;

	}

	pd->open_bdev_handle = bdev_handle;



	ret = pkt_get_last_written(pd, &lba);

	if (ret) {
@@ -2180,9 +2184,9 @@ static int pkt_open_dev(struct pktcdvd_device *pd, bool write) 
	}



	set_capacity(pd->disk, lba << 2);

	set_capacity_and_notify(pd->bdev->bd_disk, lba << 2);

	set_capacity_and_notify(pd->bdev_handle->bdev->bd_disk, lba << 2);



	q = bdev_get_queue(pd->bdev);

	q = bdev_get_queue(pd->bdev_handle->bdev);

	if (write) {

		ret = pkt_open_write(pd);

		if (ret)
@@ -2214,7 +2218,7 @@ static int pkt_open_dev(struct pktcdvd_device *pd, bool write) 
	return 0;



out_putdev:

	blkdev_put(bdev, pd);

	bdev_release(bdev_handle);

out:

	return ret;

}
@@ -2233,7 +2237,8 @@ static void pkt_release_dev(struct pktcdvd_device *pd, int flush) 
	pkt_lock_door(pd, 0);



	pkt_set_speed(pd, MAX_SPEED, MAX_SPEED);

	blkdev_put(pd->bdev, pd);

	bdev_release(pd->open_bdev_handle);

	pd->open_bdev_handle = NULL;



	pkt_shrink_pktlist(pd);

}
@@ -2321,8 +2326,8 @@ static void pkt_end_io_read_cloned(struct bio *bio) 


static void pkt_make_request_read(struct pktcdvd_device *pd, struct bio *bio)

{

	struct bio *cloned_bio =

		bio_alloc_clone(pd->bdev, bio, GFP_NOIO, &pkt_bio_set);

	struct bio *cloned_bio = bio_alloc_clone(pd->bdev_handle->bdev, bio,

		GFP_NOIO, &pkt_bio_set);

	struct packet_stacked_data *psd = mempool_alloc(&psd_pool, GFP_NOIO);



	psd->pd = pd;
@@ -2492,7 +2497,7 @@ static int pkt_new_dev(struct pktcdvd_device *pd, dev_t dev) 
{

	struct device *ddev = disk_to_dev(pd->disk);

	int i;

	struct block_device *bdev;

	struct bdev_handle *bdev_handle;

	struct scsi_device *sdev;



	if (pd->pkt_dev == dev) {
@@ -2503,8 +2508,9 @@ static int pkt_new_dev(struct pktcdvd_device *pd, dev_t dev) 
		struct pktcdvd_device *pd2 = pkt_devs[i];

		if (!pd2)

			continue;

		if (pd2->bdev->bd_dev == dev) {

			dev_err(ddev, "%pg already setup\n", pd2->bdev);

		if (pd2->bdev_handle->bdev->bd_dev == dev) {

			dev_err(ddev, "%pg already setup\n",

				pd2->bdev_handle->bdev);

			return -EBUSY;

		}

		if (pd2->pkt_dev == dev) {
@@ -2513,13 +2519,13 @@ static int pkt_new_dev(struct pktcdvd_device *pd, dev_t dev) 
		}

	}



	bdev = blkdev_get_by_dev(dev, BLK_OPEN_READ | BLK_OPEN_NDELAY, NULL,

				 NULL);

	if (IS_ERR(bdev))

		return PTR_ERR(bdev);

	sdev = scsi_device_from_queue(bdev->bd_disk->queue);

	bdev_handle = bdev_open_by_dev(dev, BLK_OPEN_READ | BLK_OPEN_NDELAY,

				       NULL, NULL);

	if (IS_ERR(bdev_handle))

		return PTR_ERR(bdev_handle);

	sdev = scsi_device_from_queue(bdev_handle->bdev->bd_disk->queue);

	if (!sdev) {

		blkdev_put(bdev, NULL);

		bdev_release(bdev_handle);

		return -EINVAL;

	}

	put_device(&sdev->sdev_gendev);
@@ -2527,8 +2533,8 @@ static int pkt_new_dev(struct pktcdvd_device *pd, dev_t dev) 
	/* This is safe, since we have a reference from open(). */

	__module_get(THIS_MODULE);



	pd->bdev = bdev;

	set_blocksize(bdev, CD_FRAMESIZE);

	pd->bdev_handle = bdev_handle;

	set_blocksize(bdev_handle->bdev, CD_FRAMESIZE);



	pkt_init_queue(pd);
@@ -2540,11 +2546,11 @@ static int pkt_new_dev(struct pktcdvd_device *pd, dev_t dev) 
	}



	proc_create_single_data(pd->disk->disk_name, 0, pkt_proc, pkt_seq_show, pd);

	dev_notice(ddev, "writer mapped to %pg\n", bdev);

	dev_notice(ddev, "writer mapped to %pg\n", bdev_handle->bdev);

	return 0;



out_mem:

	blkdev_put(bdev, NULL);

	bdev_release(bdev_handle);

	/* This is safe: open() is still holding a reference. */

	module_put(THIS_MODULE);

	return -ENOMEM;
@@ -2599,9 +2605,9 @@ static unsigned int pkt_check_events(struct gendisk *disk, 


	if (!pd)

		return 0;

	if (!pd->bdev)

	if (!pd->bdev_handle)

		return 0;

	attached_disk = pd->bdev->bd_disk;

	attached_disk = pd->bdev_handle->bdev->bd_disk;

	if (!attached_disk || !attached_disk->fops->check_events)

		return 0;

	return attached_disk->fops->check_events(attached_disk, clearing);
@@ -2686,7 +2692,7 @@ static int pkt_setup_dev(dev_t dev, dev_t* pkt_dev) 
		goto out_mem2;



	/* inherit events of the host device */

	disk->events = pd->bdev->bd_disk->events;

	disk->events = pd->bdev_handle->bdev->bd_disk->events;



	ret = add_disk(disk);

	if (ret)
@@ -2751,7 +2757,7 @@ static int pkt_remove_dev(dev_t pkt_dev) 
	pkt_debugfs_dev_remove(pd);

	pkt_sysfs_dev_remove(pd);



	blkdev_put(pd->bdev, NULL);

	bdev_release(pd->bdev_handle);



	remove_proc_entry(pd->disk->disk_name, pkt_proc);

	dev_notice(ddev, "writer unmapped\n");
@@ -2778,7 +2784,7 @@ static void pkt_get_status(struct pkt_ctrl_command *ctrl_cmd) 


	pd = pkt_find_dev_from_minor(ctrl_cmd->dev_index);

	if (pd) {

		ctrl_cmd->dev = new_encode_dev(pd->bdev->bd_dev);

		ctrl_cmd->dev = new_encode_dev(pd->bdev_handle->bdev->bd_dev);

		ctrl_cmd->pkt_dev = new_encode_dev(pd->pkt_dev);

	} else {

		ctrl_cmd->dev = 0;

include/linux/pktcdvd.h

+3 −1
Original line number Diff line number Diff line
@@ -154,7 +154,9 @@ struct packet_stacked_data 


struct pktcdvd_device

{

	struct block_device	*bdev;		/* dev attached */

	struct bdev_handle	*bdev_handle;	/* dev attached */

	/* handle acquired for bdev during pkt_open_dev() */

	struct bdev_handle	*open_bdev_handle;

	dev_t			pkt_dev;	/* our dev */

	struct packet_settings	settings;

	struct packet_stats	stats;