Attachment 23858 Details for Bug 60904

[patch] add struct file argument to block device ioctl

00-blkdev-ioctl-file (text/plain), 13.17 KB, created by Jens Axboe on 2004-09-23 20:56:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jens Axboe

Created: 2004-09-23 20:56:55 UTC

Size: 13.17 KB

patch

obsolete

>diff -urp /opt/kernel/linux-2.6.5/drivers/block/paride/pcd.c linux-2.6.5/drivers/block/paride/pcd.c
>--- /opt/kernel/linux-2.6.5/drivers/block/paride/pcd.c	2004-09-23 14:36:10.322578539 +0200
>+++ linux-2.6.5/drivers/block/paride/pcd.c	2004-09-23 14:40:27.278196577 +0200
>@@ -259,7 +259,7 @@ static int pcd_block_ioctl(struct inode 
> 				unsigned cmd, unsigned long arg)
> {
> 	struct pcd_unit *cd = inode->i_bdev->bd_disk->private_data;
>-	return cdrom_ioctl(&cd->info, inode, cmd, arg);
>+	return cdrom_ioctl(file, &cd->info, inode, cmd, arg);
> }
> 
> static int pcd_block_media_changed(struct gendisk *disk)
>diff -urp /opt/kernel/linux-2.6.5/drivers/block/scsi_ioctl.c linux-2.6.5/drivers/block/scsi_ioctl.c
>--- /opt/kernel/linux-2.6.5/drivers/block/scsi_ioctl.c	2004-09-23 14:36:10.456564264 +0200
>+++ linux-2.6.5/drivers/block/scsi_ioctl.c	2004-09-23 14:40:18.508131330 +0200
>@@ -311,7 +311,8 @@ error:
> 	return err;
> }
> 
>-int scsi_cmd_ioctl(struct gendisk *bd_disk, unsigned int cmd, unsigned long arg)
>+int scsi_cmd_ioctl(struct file *file, struct gendisk *bd_disk, unsigned int cmd,
>+		   unsigned long arg)
> {
> 	request_queue_t *q;
> 	struct request *rq;
>diff -urp /opt/kernel/linux-2.6.5/drivers/cdrom/cdrom.c linux-2.6.5/drivers/cdrom/cdrom.c
>--- /opt/kernel/linux-2.6.5/drivers/cdrom/cdrom.c	2004-09-23 14:36:11.302474140 +0200
>+++ linux-2.6.5/drivers/cdrom/cdrom.c	2004-09-23 14:39:45.094692563 +0200
>@@ -2045,14 +2045,14 @@ retry:
>  * these days. ATAPI / SCSI specific code now mainly resides in
>  * mmc_ioct().
>  */
>-int cdrom_ioctl(struct cdrom_device_info *cdi, struct inode *ip,
>-		unsigned int cmd, unsigned long arg)
>+int cdrom_ioctl(struct file *file, struct cdrom_device_info *cdi,
>+		struct inode *ip, unsigned int cmd, unsigned long arg)
> {
> 	struct cdrom_device_ops *cdo = cdi->ops;
> 	int ret;
> 
> 	/* Try the generic SCSI command ioctl's first.. */
>-	ret = scsi_cmd_ioctl(ip->i_bdev->bd_disk, cmd, arg);
>+	ret = scsi_cmd_ioctl(file, ip->i_bdev->bd_disk, cmd, arg);
> 	if (ret != -ENOTTY)
> 		return ret;
> 
>diff -urp /opt/kernel/linux-2.6.5/drivers/cdrom/cdu31a.c linux-2.6.5/drivers/cdrom/cdu31a.c
>--- /opt/kernel/linux-2.6.5/drivers/cdrom/cdu31a.c	2004-09-23 14:36:11.316472649 +0200
>+++ linux-2.6.5/drivers/cdrom/cdu31a.c	2004-09-23 14:40:27.280196364 +0200
>@@ -3180,7 +3180,7 @@ static int scd_block_release(struct inod
> static int scd_block_ioctl(struct inode *inode, struct file *file,
> 				unsigned cmd, unsigned long arg)
> {
>-	return cdrom_ioctl(&scd_info, inode, cmd, arg);
>+	return cdrom_ioctl(file, &scd_info, inode, cmd, arg);
> }
> 
> static int scd_block_media_changed(struct gendisk *disk)
>diff -urp /opt/kernel/linux-2.6.5/drivers/cdrom/cm206.c linux-2.6.5/drivers/cdrom/cm206.c
>--- /opt/kernel/linux-2.6.5/drivers/cdrom/cm206.c	2004-09-23 14:36:11.317472543 +0200
>+++ linux-2.6.5/drivers/cdrom/cm206.c	2004-09-23 14:40:27.281196258 +0200
>@@ -1363,7 +1363,7 @@ static int cm206_block_release(struct in
> static int cm206_block_ioctl(struct inode *inode, struct file *file,
> 				unsigned cmd, unsigned long arg)
> {
>-	return cdrom_ioctl(&cm206_info, inode, cmd, arg);
>+	return cdrom_ioctl(file, &cm206_info, inode, cmd, arg);
> }
> 
> static int cm206_block_media_changed(struct gendisk *disk)
>diff -urp /opt/kernel/linux-2.6.5/drivers/cdrom/mcd.c linux-2.6.5/drivers/cdrom/mcd.c
>--- /opt/kernel/linux-2.6.5/drivers/cdrom/mcd.c	2004-09-23 14:36:11.313472969 +0200
>+++ linux-2.6.5/drivers/cdrom/mcd.c	2004-09-23 14:40:27.282196151 +0200
>@@ -227,7 +227,7 @@ static int mcd_block_release(struct inod
> static int mcd_block_ioctl(struct inode *inode, struct file *file,
> 				unsigned cmd, unsigned long arg)
> {
>-	return cdrom_ioctl(&mcd_info, inode, cmd, arg);
>+	return cdrom_ioctl(file, &mcd_info, inode, cmd, arg);
> }
> 
> static int mcd_block_media_changed(struct gendisk *disk)
>diff -urp /opt/kernel/linux-2.6.5/drivers/cdrom/mcdx.c linux-2.6.5/drivers/cdrom/mcdx.c
>--- /opt/kernel/linux-2.6.5/drivers/cdrom/mcdx.c	2004-09-23 14:36:11.312473075 +0200
>+++ linux-2.6.5/drivers/cdrom/mcdx.c	2004-09-23 14:40:27.283196045 +0200
>@@ -237,7 +237,7 @@ static int mcdx_block_ioctl(struct inode
> 				unsigned cmd, unsigned long arg)
> {
> 	struct s_drive_stuff *p = inode->i_bdev->bd_disk->private_data;
>-	return cdrom_ioctl(&p->info, inode, cmd, arg);
>+	return cdrom_ioctl(file, &p->info, inode, cmd, arg);
> }
> 
> static int mcdx_block_media_changed(struct gendisk *disk)
>diff -urp /opt/kernel/linux-2.6.5/drivers/cdrom/sbpcd.c linux-2.6.5/drivers/cdrom/sbpcd.c
>--- /opt/kernel/linux-2.6.5/drivers/cdrom/sbpcd.c	2004-09-23 14:36:11.303474034 +0200
>+++ linux-2.6.5/drivers/cdrom/sbpcd.c	2004-09-23 14:40:27.298194446 +0200
>@@ -5372,7 +5372,7 @@ static int sbpcd_block_ioctl(struct inod
> 				unsigned cmd, unsigned long arg)
> {
> 	struct sbpcd_drive *p = inode->i_bdev->bd_disk->private_data;
>-	return cdrom_ioctl(p->sbpcd_infop, inode, cmd, arg);
>+	return cdrom_ioctl(file, p->sbpcd_infop, inode, cmd, arg);
> }
> 
> static int sbpcd_block_media_changed(struct gendisk *disk)
>diff -urp /opt/kernel/linux-2.6.5/drivers/cdrom/viocd.c linux-2.6.5/drivers/cdrom/viocd.c
>--- /opt/kernel/linux-2.6.5/drivers/cdrom/viocd.c	2004-09-23 14:36:11.332470945 +0200
>+++ linux-2.6.5/drivers/cdrom/viocd.c	2004-09-23 14:40:27.299194339 +0200
>@@ -200,7 +200,7 @@ static int viocd_blk_ioctl(struct inode 
> 		unsigned cmd, unsigned long arg)
> {
> 	struct disk_info *di = inode->i_bdev->bd_disk->private_data;
>-	return cdrom_ioctl(&di->viocd_info, inode, cmd, arg);
>+	return cdrom_ioctl(file, &di->viocd_info, inode, cmd, arg);
> }
> 
> static int viocd_blk_media_changed(struct gendisk *disk)
>diff -urp /opt/kernel/linux-2.6.5/drivers/ide/ide.c linux-2.6.5/drivers/ide/ide.c
>--- /opt/kernel/linux-2.6.5/drivers/ide/ide.c	2004-09-23 14:36:11.004505886 +0200
>+++ linux-2.6.5/drivers/ide/ide.c	2004-09-23 14:40:27.351188797 +0200
>@@ -1501,8 +1501,8 @@ static int generic_ide_resume(struct dev
> 	return ide_do_drive_cmd(drive, &rq, ide_head_wait);
> }
> 
>-int generic_ide_ioctl(struct block_device *bdev, unsigned int cmd,
>-			unsigned long arg)
>+int generic_ide_ioctl(struct file *file, struct block_device *bdev,
>+			unsigned int cmd, unsigned long arg)
> {
> 	ide_drive_t *drive = bdev->bd_disk->private_data;
> 	ide_settings_t *setting;
>@@ -1652,7 +1652,7 @@ int generic_ide_ioctl(struct block_devic
> 
> 		case CDROMEJECT:
> 		case CDROMCLOSETRAY:
>-			return scsi_cmd_ioctl(bdev->bd_disk, cmd, arg);
>+			return scsi_cmd_ioctl(file, bdev->bd_disk, cmd, arg);
> 
> 		case HDIO_GET_BUSSTATE:
> 			if (!capable(CAP_SYS_ADMIN))
>diff -urp /opt/kernel/linux-2.6.5/drivers/ide/ide-cd.c linux-2.6.5/drivers/ide/ide-cd.c
>--- /opt/kernel/linux-2.6.5/drivers/ide/ide-cd.c	2004-09-23 14:36:11.037502371 +0200
>+++ linux-2.6.5/drivers/ide/ide-cd.c	2004-09-23 14:40:27.307193487 +0200
>@@ -3425,10 +3425,10 @@ static int idecd_ioctl (struct inode *in
> {
> 	struct block_device *bdev = inode->i_bdev;
> 	ide_drive_t *drive = bdev->bd_disk->private_data;
>-	int err = generic_ide_ioctl(bdev, cmd, arg);
>+	int err = generic_ide_ioctl(file, bdev, cmd, arg);
> 	if (err == -EINVAL) {
> 		struct cdrom_info *info = drive->driver_data;
>-		err = cdrom_ioctl(&info->devinfo, inode, cmd, arg);
>+		err = cdrom_ioctl(file, &info->devinfo, inode, cmd, arg);
> 	}
> 	return err;
> }
>diff -urp /opt/kernel/linux-2.6.5/drivers/ide/ide-disk.c linux-2.6.5/drivers/ide/ide-disk.c
>--- /opt/kernel/linux-2.6.5/drivers/ide/ide-disk.c	2004-09-23 14:36:11.037502371 +0200
>+++ linux-2.6.5/drivers/ide/ide-disk.c	2004-09-23 14:40:27.324191675 +0200
>@@ -1882,7 +1882,7 @@ static int idedisk_ioctl(struct inode *i
> 			unsigned int cmd, unsigned long arg)
> {
> 	struct block_device *bdev = inode->i_bdev;
>-	return generic_ide_ioctl(bdev, cmd, arg);
>+	return generic_ide_ioctl(file, bdev, cmd, arg);
> }
> 
> static int idedisk_media_changed(struct gendisk *disk)
>diff -urp /opt/kernel/linux-2.6.5/drivers/ide/ide-floppy.c linux-2.6.5/drivers/ide/ide-floppy.c
>--- /opt/kernel/linux-2.6.5/drivers/ide/ide-floppy.c	2004-09-23 14:36:11.044501625 +0200
>+++ linux-2.6.5/drivers/ide/ide-floppy.c	2004-09-23 14:39:07.921654274 +0200
>@@ -1945,7 +1945,7 @@ static int idefloppy_ioctl(struct inode 
> 	struct block_device *bdev = inode->i_bdev;
> 	ide_drive_t *drive = bdev->bd_disk->private_data;
> 	idefloppy_floppy_t *floppy = drive->driver_data;
>-	int err = generic_ide_ioctl(bdev, cmd, arg);
>+	int err = generic_ide_ioctl(file, bdev, cmd, arg);
> 	int prevent = (arg) ? 1 : 0;
> 	idefloppy_pc_t pc;
> 	if (err != -EINVAL)
>diff -urp /opt/kernel/linux-2.6.5/drivers/ide/ide-tape.c linux-2.6.5/drivers/ide/ide-tape.c
>--- /opt/kernel/linux-2.6.5/drivers/ide/ide-tape.c	2004-09-23 14:36:11.024503756 +0200
>+++ linux-2.6.5/drivers/ide/ide-tape.c	2004-09-23 14:40:27.349189011 +0200
>@@ -4813,7 +4813,7 @@ static int idetape_ioctl(struct inode *i
> {
> 	struct block_device *bdev = inode->i_bdev;
> 	ide_drive_t *drive = bdev->bd_disk->private_data;
>-	int err = generic_ide_ioctl(bdev, cmd, arg);
>+	int err = generic_ide_ioctl(file, bdev, cmd, arg);
> 	if (err == -EINVAL)
> 		err = idetape_blkdev_ioctl(drive, cmd, arg);
> 	return err;
>diff -urp /opt/kernel/linux-2.6.5/drivers/scsi/ide-scsi.c linux-2.6.5/drivers/scsi/ide-scsi.c
>--- /opt/kernel/linux-2.6.5/drivers/scsi/ide-scsi.c	2004-09-23 14:36:09.648650340 +0200
>+++ linux-2.6.5/drivers/scsi/ide-scsi.c	2004-09-23 14:40:27.353188584 +0200
>@@ -721,7 +721,7 @@ static int idescsi_ide_ioctl(struct inod
> 			unsigned int cmd, unsigned long arg)
> {
> 	struct block_device *bdev = inode->i_bdev;
>-	return generic_ide_ioctl(bdev, cmd, arg);
>+	return generic_ide_ioctl(file, bdev, cmd, arg);
> }
> 
> static struct block_device_operations idescsi_ops = {
>diff -urp /opt/kernel/linux-2.6.5/drivers/scsi/sd.c linux-2.6.5/drivers/scsi/sd.c
>--- /opt/kernel/linux-2.6.5/drivers/scsi/sd.c	2004-09-23 14:36:09.585657051 +0200
>+++ linux-2.6.5/drivers/scsi/sd.c	2004-09-23 14:38:14.368361292 +0200
>@@ -579,7 +579,7 @@ static int sd_ioctl(struct inode * inode
> 		case SCSI_IOCTL_GET_BUS_NUMBER:
> 			return scsi_ioctl(sdp, cmd, (void *)arg);
> 		default:
>-			error = scsi_cmd_ioctl(disk, cmd, arg);
>+			error = scsi_cmd_ioctl(filp, disk, cmd, arg);
> 			if (error != -ENOTTY)
> 				return error;
> 	}
>diff -urp /opt/kernel/linux-2.6.5/drivers/scsi/sr.c linux-2.6.5/drivers/scsi/sr.c
>--- /opt/kernel/linux-2.6.5/drivers/scsi/sr.c	2004-09-23 14:36:09.492666958 +0200
>+++ linux-2.6.5/drivers/scsi/sr.c	2004-09-23 14:40:27.354188478 +0200
>@@ -492,7 +492,7 @@ static int sr_block_ioctl(struct inode *
>                 case SCSI_IOCTL_GET_BUS_NUMBER:
>                         return scsi_ioctl(sdev, cmd, (void *)arg);
> 	}
>-	return cdrom_ioctl(&cd->cdi, inode, cmd, arg);
>+	return cdrom_ioctl(file, &cd->cdi, inode, cmd, arg);
> }
> 
> static int sr_block_media_changed(struct gendisk *disk)
>diff -urp /opt/kernel/linux-2.6.5/drivers/scsi/st.c linux-2.6.5/drivers/scsi/st.c
>--- /opt/kernel/linux-2.6.5/drivers/scsi/st.c	2004-09-23 14:36:09.648650340 +0200
>+++ linux-2.6.5/drivers/scsi/st.c	2004-09-23 14:37:54.838442409 +0200
>@@ -3407,7 +3407,7 @@ static int st_ioctl(struct inode *inode,
> 		case SCSI_IOCTL_GET_BUS_NUMBER:
> 			break;
> 		default:
>-			i = scsi_cmd_ioctl(STp->disk, cmd_in, arg);
>+			i = scsi_cmd_ioctl(file, STp->disk, cmd_in, arg);
> 			if (i != -ENOTTY)
> 				return i;
> 			break;
>diff -urp /opt/kernel/linux-2.6.5/include/linux/blkdev.h linux-2.6.5/include/linux/blkdev.h
>--- /opt/kernel/linux-2.6.5/include/linux/blkdev.h	2004-09-23 14:36:17.943766570 +0200
>+++ linux-2.6.5/include/linux/blkdev.h	2004-09-23 14:37:35.994450372 +0200
>@@ -526,7 +526,7 @@ extern int blk_remove_plug(request_queue
> extern void blk_recount_segments(request_queue_t *, struct bio *);
> extern int blk_phys_contig_segment(request_queue_t *q, struct bio *, struct bio *);
> extern int blk_hw_contig_segment(request_queue_t *q, struct bio *, struct bio *);
>-extern int scsi_cmd_ioctl(struct gendisk *, unsigned int, unsigned long);
>+extern int scsi_cmd_ioctl(struct file *, struct gendisk *, unsigned int, unsigned long);
> extern void blk_start_queue(request_queue_t *q);
> extern void blk_stop_queue(request_queue_t *q);
> extern void __blk_stop_queue(request_queue_t *q);
>diff -urp /opt/kernel/linux-2.6.5/include/linux/cdrom.h linux-2.6.5/include/linux/cdrom.h
>--- /opt/kernel/linux-2.6.5/include/linux/cdrom.h	2004-09-23 14:36:17.327832192 +0200
>+++ linux-2.6.5/include/linux/cdrom.h	2004-09-23 14:40:27.355188371 +0200
>@@ -972,8 +972,8 @@ struct cdrom_device_ops {
> extern int cdrom_open(struct cdrom_device_info *cdi, struct inode *ip,
> 			struct file *fp);
> extern int cdrom_release(struct cdrom_device_info *cdi, struct file *fp);
>-extern int cdrom_ioctl(struct cdrom_device_info *cdi, struct inode *ip,
>-		unsigned int cmd, unsigned long arg);
>+extern int cdrom_ioctl(struct file *file, struct cdrom_device_info *cdi,
>+		struct inode *ip, unsigned int cmd, unsigned long arg);
> extern int cdrom_media_changed(struct cdrom_device_info *);
> 
> extern int register_cdrom(struct cdrom_device_info *cdi);
>diff -urp /opt/kernel/linux-2.6.5/include/linux/ide.h linux-2.6.5/include/linux/ide.h
>--- /opt/kernel/linux-2.6.5/include/linux/ide.h	2004-09-23 14:36:18.009759539 +0200
>+++ linux-2.6.5/include/linux/ide.h	2004-09-23 14:40:27.357188158 +0200
>@@ -1163,7 +1163,7 @@ typedef struct ide_driver_s {
> 
> #define DRIVER(drive)		((drive)->driver)
> 
>-extern int generic_ide_ioctl(struct block_device *, unsigned, unsigned long);
>+extern int generic_ide_ioctl(struct file *, struct block_device *, unsigned, unsigned long);
> 
> /*
>  * ide_hwifs[] is the master data structure used to keep track

Actions: View | Diff

Attachments on bug 60904: 23858 | 23859