Attachment #23858 for bug #60904

View | Details | Raw Unified | Return to bug 60904
Collapse All | Expand All

Lines 259-265 static int pcd_block_ioctl(struct inode Link Here

(-)/opt/kernel/linux-2.6.5/drivers/block/paride/pcd.c (-1 / +1 lines)
259	unsigned cmd, unsigned long arg)	259	unsigned cmd, unsigned long arg)
260	{	260	{
261	struct pcd_unit *cd = inode->i_bdev->bd_disk->private_data;	261	struct pcd_unit *cd = inode->i_bdev->bd_disk->private_data;
262	return cdrom_ioctl(&cd->info, inode, cmd, arg);	262	return cdrom_ioctl(file, &cd->info, inode, cmd, arg);
263	}	263	}
264		264
265	static int pcd_block_media_changed(struct gendisk *disk)	265	static int pcd_block_media_changed(struct gendisk *disk)

Lines 311-317 error: Link Here

(-)/opt/kernel/linux-2.6.5/drivers/block/scsi_ioctl.c (-1 / +2 lines)
311	return err;	311	return err;
312	}	312	}
313		313
314	int scsi_cmd_ioctl(struct gendisk *bd_disk, unsigned int cmd, unsigned long arg)	314	int scsi_cmd_ioctl(struct file file, struct gendisk bd_disk, unsigned int cmd,
		315	unsigned long arg)
315	{	316	{
316	request_queue_t *q;	317	request_queue_t *q;
317	struct request *rq;	318	struct request *rq;




 * these days. ATAPI / SCSI specific code now mainly resides in
 * mmc_ioct().
 */
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(file, ip->i_bdev->bd_disk, cmd, arg);
	if (ret != -ENOTTY)
		return ret;


Lines 3180-3186 static int scd_block_release(struct inod Link Here

(-)/opt/kernel/linux-2.6.5/drivers/cdrom/cdu31a.c (-1 / +1 lines)
3180	static int scd_block_ioctl(struct inode inode, struct file file,	3180	static int scd_block_ioctl(struct inode inode, struct file file,
3181	unsigned cmd, unsigned long arg)	3181	unsigned cmd, unsigned long arg)
3182	{	3182	{
3183	return cdrom_ioctl(&scd_info, inode, cmd, arg);	3183	return cdrom_ioctl(file, &scd_info, inode, cmd, arg);
3184	}	3184	}
3185		3185
3186	static int scd_block_media_changed(struct gendisk *disk)	3186	static int scd_block_media_changed(struct gendisk *disk)

Lines 1363-1369 static int cm206_block_release(struct in Link Here

(-)/opt/kernel/linux-2.6.5/drivers/cdrom/cm206.c (-1 / +1 lines)
1363	static int cm206_block_ioctl(struct inode inode, struct file file,	1363	static int cm206_block_ioctl(struct inode inode, struct file file,
1364	unsigned cmd, unsigned long arg)	1364	unsigned cmd, unsigned long arg)
1365	{	1365	{
1366	return cdrom_ioctl(&cm206_info, inode, cmd, arg);	1366	return cdrom_ioctl(file, &cm206_info, inode, cmd, arg);
1367	}	1367	}
1368		1368
1369	static int cm206_block_media_changed(struct gendisk *disk)	1369	static int cm206_block_media_changed(struct gendisk *disk)

Lines 227-233 static int mcd_block_release(struct inod Link Here

(-)/opt/kernel/linux-2.6.5/drivers/cdrom/mcd.c (-1 / +1 lines)
227	static int mcd_block_ioctl(struct inode inode, struct file file,	227	static int mcd_block_ioctl(struct inode inode, struct file file,
228	unsigned cmd, unsigned long arg)	228	unsigned cmd, unsigned long arg)
229	{	229	{
230	return cdrom_ioctl(&mcd_info, inode, cmd, arg);	230	return cdrom_ioctl(file, &mcd_info, inode, cmd, arg);
231	}	231	}
232		232
233	static int mcd_block_media_changed(struct gendisk *disk)	233	static int mcd_block_media_changed(struct gendisk *disk)

Lines 237-243 static int mcdx_block_ioctl(struct inode Link Here

(-)/opt/kernel/linux-2.6.5/drivers/cdrom/mcdx.c (-1 / +1 lines)
237	unsigned cmd, unsigned long arg)	237	unsigned cmd, unsigned long arg)
238	{	238	{
239	struct s_drive_stuff *p = inode->i_bdev->bd_disk->private_data;	239	struct s_drive_stuff *p = inode->i_bdev->bd_disk->private_data;
240	return cdrom_ioctl(&p->info, inode, cmd, arg);	240	return cdrom_ioctl(file, &p->info, inode, cmd, arg);
241	}	241	}
242		242
243	static int mcdx_block_media_changed(struct gendisk *disk)	243	static int mcdx_block_media_changed(struct gendisk *disk)

Lines 5372-5378 static int sbpcd_block_ioctl(struct inod Link Here

(-)/opt/kernel/linux-2.6.5/drivers/cdrom/sbpcd.c (-1 / +1 lines)
5372	unsigned cmd, unsigned long arg)	5372	unsigned cmd, unsigned long arg)
5373	{	5373	{
5374	struct sbpcd_drive *p = inode->i_bdev->bd_disk->private_data;	5374	struct sbpcd_drive *p = inode->i_bdev->bd_disk->private_data;
5375	return cdrom_ioctl(p->sbpcd_infop, inode, cmd, arg);	5375	return cdrom_ioctl(file, p->sbpcd_infop, inode, cmd, arg);
5376	}	5376	}
5377		5377
5378	static int sbpcd_block_media_changed(struct gendisk *disk)	5378	static int sbpcd_block_media_changed(struct gendisk *disk)

Lines 200-206 static int viocd_blk_ioctl(struct inode Link Here

(-)/opt/kernel/linux-2.6.5/drivers/cdrom/viocd.c (-1 / +1 lines)
200	unsigned cmd, unsigned long arg)	200	unsigned cmd, unsigned long arg)
201	{	201	{
202	struct disk_info *di = inode->i_bdev->bd_disk->private_data;	202	struct disk_info *di = inode->i_bdev->bd_disk->private_data;
203	return cdrom_ioctl(&di->viocd_info, inode, cmd, arg);	203	return cdrom_ioctl(file, &di->viocd_info, inode, cmd, arg);
204	}	204	}
205		205
206	static int viocd_blk_media_changed(struct gendisk *disk)	206	static int viocd_blk_media_changed(struct gendisk *disk)

Lines 1501-1508 static int generic_ide_resume(struct dev Link Here

(-)/opt/kernel/linux-2.6.5/drivers/ide/ide.c (-3 / +3 lines)
1501	return ide_do_drive_cmd(drive, &rq, ide_head_wait);	1501	return ide_do_drive_cmd(drive, &rq, ide_head_wait);
1502	}	1502	}
1503		1503
1504	int generic_ide_ioctl(struct block_device *bdev, unsigned int cmd,	1504	int generic_ide_ioctl(struct file file, struct block_device bdev,
1505	unsigned long arg)	1505	unsigned int cmd, unsigned long arg)
1506	{	1506	{
1507	ide_drive_t *drive = bdev->bd_disk->private_data;	1507	ide_drive_t *drive = bdev->bd_disk->private_data;
1508	ide_settings_t *setting;	1508	ide_settings_t *setting;
Lines 1652-1658 int generic_ide_ioctl(struct block_devic Link Here
1652		1652
1653	case CDROMEJECT:	1653	case CDROMEJECT:
1654	case CDROMCLOSETRAY:	1654	case CDROMCLOSETRAY:
1655	return scsi_cmd_ioctl(bdev->bd_disk, cmd, arg);	1655	return scsi_cmd_ioctl(file, bdev->bd_disk, cmd, arg);
1656		1656
1657	case HDIO_GET_BUSSTATE:	1657	case HDIO_GET_BUSSTATE:
1658	if (!capable(CAP_SYS_ADMIN))	1658	if (!capable(CAP_SYS_ADMIN))

Lines 3425-3434 static int idecd_ioctl (struct inode *in Link Here

(-)/opt/kernel/linux-2.6.5/drivers/ide/ide-cd.c (-2 / +2 lines)
3425	{	3425	{
3426	struct block_device *bdev = inode->i_bdev;	3426	struct block_device *bdev = inode->i_bdev;
3427	ide_drive_t *drive = bdev->bd_disk->private_data;	3427	ide_drive_t *drive = bdev->bd_disk->private_data;
3428	int err = generic_ide_ioctl(bdev, cmd, arg);	3428	int err = generic_ide_ioctl(file, bdev, cmd, arg);
3429	if (err == -EINVAL) {	3429	if (err == -EINVAL) {
3430	struct cdrom_info *info = drive->driver_data;	3430	struct cdrom_info *info = drive->driver_data;
3431	err = cdrom_ioctl(&info->devinfo, inode, cmd, arg);	3431	err = cdrom_ioctl(file, &info->devinfo, inode, cmd, arg);
3432	}	3432	}
3433	return err;	3433	return err;
3434	}	3434	}

Lines 1882-1888 static int idedisk_ioctl(struct inode *i Link Here

(-)/opt/kernel/linux-2.6.5/drivers/ide/ide-disk.c (-1 / +1 lines)
1882	unsigned int cmd, unsigned long arg)	1882	unsigned int cmd, unsigned long arg)
1883	{	1883	{
1884	struct block_device *bdev = inode->i_bdev;	1884	struct block_device *bdev = inode->i_bdev;
1885	return generic_ide_ioctl(bdev, cmd, arg);	1885	return generic_ide_ioctl(file, bdev, cmd, arg);
1886	}	1886	}
1887		1887
1888	static int idedisk_media_changed(struct gendisk *disk)	1888	static int idedisk_media_changed(struct gendisk *disk)

Lines 1945-1951 static int idefloppy_ioctl(struct inode Link Here

(-)/opt/kernel/linux-2.6.5/drivers/ide/ide-floppy.c (-1 / +1 lines)
1945	struct block_device *bdev = inode->i_bdev;	1945	struct block_device *bdev = inode->i_bdev;
1946	ide_drive_t *drive = bdev->bd_disk->private_data;	1946	ide_drive_t *drive = bdev->bd_disk->private_data;
1947	idefloppy_floppy_t *floppy = drive->driver_data;	1947	idefloppy_floppy_t *floppy = drive->driver_data;
1948	int err = generic_ide_ioctl(bdev, cmd, arg);	1948	int err = generic_ide_ioctl(file, bdev, cmd, arg);
1949	int prevent = (arg) ? 1 : 0;	1949	int prevent = (arg) ? 1 : 0;
1950	idefloppy_pc_t pc;	1950	idefloppy_pc_t pc;
1951	if (err != -EINVAL)	1951	if (err != -EINVAL)

Lines 4813-4819 static int idetape_ioctl(struct inode *i Link Here

(-)/opt/kernel/linux-2.6.5/drivers/ide/ide-tape.c (-1 / +1 lines)
4813	{	4813	{
4814	struct block_device *bdev = inode->i_bdev;	4814	struct block_device *bdev = inode->i_bdev;
4815	ide_drive_t *drive = bdev->bd_disk->private_data;	4815	ide_drive_t *drive = bdev->bd_disk->private_data;
4816	int err = generic_ide_ioctl(bdev, cmd, arg);	4816	int err = generic_ide_ioctl(file, bdev, cmd, arg);
4817	if (err == -EINVAL)	4817	if (err == -EINVAL)
4818	err = idetape_blkdev_ioctl(drive, cmd, arg);	4818	err = idetape_blkdev_ioctl(drive, cmd, arg);
4819	return err;	4819	return err;

Lines 721-727 static int idescsi_ide_ioctl(struct inod Link Here

(-)/opt/kernel/linux-2.6.5/drivers/scsi/ide-scsi.c (-1 / +1 lines)
721	unsigned int cmd, unsigned long arg)	721	unsigned int cmd, unsigned long arg)
722	{	722	{
723	struct block_device *bdev = inode->i_bdev;	723	struct block_device *bdev = inode->i_bdev;
724	return generic_ide_ioctl(bdev, cmd, arg);	724	return generic_ide_ioctl(file, bdev, cmd, arg);
725	}	725	}
726		726
727	static struct block_device_operations idescsi_ops = {	727	static struct block_device_operations idescsi_ops = {

Lines 579-585 static int sd_ioctl(struct inode * inode Link Here

(-)/opt/kernel/linux-2.6.5/drivers/scsi/sd.c (-1 / +1 lines)
579	case SCSI_IOCTL_GET_BUS_NUMBER:	579	case SCSI_IOCTL_GET_BUS_NUMBER:
580	return scsi_ioctl(sdp, cmd, (void *)arg);	580	return scsi_ioctl(sdp, cmd, (void *)arg);
581	default:	581	default:
582	error = scsi_cmd_ioctl(disk, cmd, arg);	582	error = scsi_cmd_ioctl(filp, disk, cmd, arg);
583	if (error != -ENOTTY)	583	if (error != -ENOTTY)
584	return error;	584	return error;
585	}	585	}

Lines 492-498 static int sr_block_ioctl(struct inode * Link Here

(-)/opt/kernel/linux-2.6.5/drivers/scsi/sr.c (-1 / +1 lines)
492	case SCSI_IOCTL_GET_BUS_NUMBER:	492	case SCSI_IOCTL_GET_BUS_NUMBER:
493	return scsi_ioctl(sdev, cmd, (void *)arg);	493	return scsi_ioctl(sdev, cmd, (void *)arg);
494	}	494	}
495	return cdrom_ioctl(&cd->cdi, inode, cmd, arg);	495	return cdrom_ioctl(file, &cd->cdi, inode, cmd, arg);
496	}	496	}
497		497
498	static int sr_block_media_changed(struct gendisk *disk)	498	static int sr_block_media_changed(struct gendisk *disk)

Lines 3407-3413 static int st_ioctl(struct inode *inode, Link Here

(-)/opt/kernel/linux-2.6.5/drivers/scsi/st.c (-1 / +1 lines)
3407	case SCSI_IOCTL_GET_BUS_NUMBER:	3407	case SCSI_IOCTL_GET_BUS_NUMBER:
3408	break;	3408	break;
3409	default:	3409	default:
3410	i = scsi_cmd_ioctl(STp->disk, cmd_in, arg);	3410	i = scsi_cmd_ioctl(file, STp->disk, cmd_in, arg);
3411	if (i != -ENOTTY)	3411	if (i != -ENOTTY)
3412	return i;	3412	return i;
3413	break;	3413	break;

Lines 526-532 extern int blk_remove_plug(request_queue Link Here

(-)/opt/kernel/linux-2.6.5/include/linux/blkdev.h (-1 / +1 lines)
526	extern void blk_recount_segments(request_queue_t , struct bio );	526	extern void blk_recount_segments(request_queue_t , struct bio );
527	extern int blk_phys_contig_segment(request_queue_t q, struct bio , struct bio *);	527	extern int blk_phys_contig_segment(request_queue_t q, struct bio , struct bio *);
528	extern int blk_hw_contig_segment(request_queue_t q, struct bio , struct bio *);	528	extern int blk_hw_contig_segment(request_queue_t q, struct bio , struct bio *);
529	extern int scsi_cmd_ioctl(struct gendisk *, unsigned int, unsigned long);	529	extern int scsi_cmd_ioctl(struct file , struct gendisk , unsigned int, unsigned long);
530	extern void blk_start_queue(request_queue_t *q);	530	extern void blk_start_queue(request_queue_t *q);
531	extern void blk_stop_queue(request_queue_t *q);	531	extern void blk_stop_queue(request_queue_t *q);
532	extern void __blk_stop_queue(request_queue_t *q);	532	extern void __blk_stop_queue(request_queue_t *q);

Lines 972-979 struct cdrom_device_ops { Link Here

(-)/opt/kernel/linux-2.6.5/include/linux/cdrom.h (-2 / +2 lines)
972	extern int cdrom_open(struct cdrom_device_info cdi, struct inode ip,	972	extern int cdrom_open(struct cdrom_device_info cdi, struct inode ip,
973	struct file *fp);	973	struct file *fp);
974	extern int cdrom_release(struct cdrom_device_info cdi, struct file fp);	974	extern int cdrom_release(struct cdrom_device_info cdi, struct file fp);
975	extern int cdrom_ioctl(struct cdrom_device_info cdi, struct inode ip,	975	extern int cdrom_ioctl(struct file file, struct cdrom_device_info cdi,
976	unsigned int cmd, unsigned long arg);	976	struct inode *ip, unsigned int cmd, unsigned long arg);
977	extern int cdrom_media_changed(struct cdrom_device_info *);	977	extern int cdrom_media_changed(struct cdrom_device_info *);
978		978
979	extern int register_cdrom(struct cdrom_device_info *cdi);	979	extern int register_cdrom(struct cdrom_device_info *cdi);

Lines 1163-1169 typedef struct ide_driver_s { Link Here

(-)/opt/kernel/linux-2.6.5/include/linux/ide.h (-1 / +1 lines)
1163		1163
1164	#define DRIVER(drive) ((drive)->driver)	1164	#define DRIVER(drive) ((drive)->driver)
1165		1165
1166	extern int generic_ide_ioctl(struct block_device *, unsigned, unsigned long);	1166	extern int generic_ide_ioctl(struct file , struct block_device , unsigned, unsigned long);
1167		1167
1168	/*	1168	/*
1169	* ide_hwifs[] is the master data structure used to keep track	1169	* ide_hwifs[] is the master data structure used to keep track

Return to bug 60904

Lines 2045-2058 retry: Link Here

(-)/opt/kernel/linux-2.6.5/drivers/cdrom/cdrom.c (-3 / +3 lines)
2045	* these days. ATAPI / SCSI specific code now mainly resides in	2045	* these days. ATAPI / SCSI specific code now mainly resides in
2046	* mmc_ioct().	2046	* mmc_ioct().
2047	*/	2047	*/
2048	int cdrom_ioctl(struct cdrom_device_info cdi, struct inode ip,	2048	int cdrom_ioctl(struct file file, struct cdrom_device_info cdi,
2049	unsigned int cmd, unsigned long arg)	2049	struct inode *ip, unsigned int cmd, unsigned long arg)
2050	{	2050	{
2051	struct cdrom_device_ops *cdo = cdi->ops;	2051	struct cdrom_device_ops *cdo = cdi->ops;
2052	int ret;	2052	int ret;
2053		2053
2054	/* Try the generic SCSI command ioctl's first.. */	2054	/* Try the generic SCSI command ioctl's first.. */
2055	ret = scsi_cmd_ioctl(ip->i_bdev->bd_disk, cmd, arg);	2055	ret = scsi_cmd_ioctl(file, ip->i_bdev->bd_disk, cmd, arg);
2056	if (ret != -ENOTTY)	2056	if (ret != -ENOTTY)
2057	return ret;	2057	return ret;
2058		2058