git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
drivers
/
ide
/
ide.c
diff --git
a/drivers/ide/ide.c
b/drivers/ide/ide.c
index
2714aa1
..
e99d9ec
100644
(file)
--- a/
drivers/ide/ide.c
+++ b/
drivers/ide/ide.c
@@
-1453,8
+1453,8
@@
static int generic_ide_resume(struct device *dev)
return ide_do_drive_cmd(drive, &rq, ide_head_wait);
}
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;
{
ide_drive_t *drive = bdev->bd_disk->private_data;
ide_settings_t *setting;
@@
-1605,7
+1605,7
@@
int generic_ide_ioctl(struct block_device *bdev, unsigned int cmd,
case CDROMEJECT:
case CDROMCLOSETRAY:
case CDROMEJECT:
case CDROMCLOSETRAY:
- return scsi_cmd_ioctl(bdev->bd_disk, cmd, p);
+ return scsi_cmd_ioctl(
file,
bdev->bd_disk, cmd, p);
case HDIO_GET_BUSSTATE:
if (!capable(CAP_SYS_ADMIN))
case HDIO_GET_BUSSTATE:
if (!capable(CAP_SYS_ADMIN))
@@
-2320,7
+2320,7
@@
int __init ide_init (void)
init_ide_data();
#ifdef CONFIG_PROC_FS
init_ide_data();
#ifdef CONFIG_PROC_FS
- proc_ide_root = proc_mkdir("ide",
0
);
+ proc_ide_root = proc_mkdir("ide",
NULL
);
#endif
#ifdef CONFIG_BLK_DEV_ALI14XX
#endif
#ifdef CONFIG_BLK_DEV_ALI14XX