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 2.0-rc4
[linux-2.6.git]
/
drivers
/
block
/
pktcdvd.c
diff --git
a/drivers/block/pktcdvd.c
b/drivers/block/pktcdvd.c
index
7590000
..
043cd27
100644
(file)
--- a/
drivers/block/pktcdvd.c
+++ b/
drivers/block/pktcdvd.c
@@
-2400,7
+2400,7
@@
static int pkt_ioctl(struct inode *inode, struct file *file, unsigned int cmd, u
case CDROM_LAST_WRITTEN:
case CDROM_SEND_PACKET:
case SCSI_IOCTL_SEND_COMMAND:
case CDROM_LAST_WRITTEN:
case CDROM_SEND_PACKET:
case SCSI_IOCTL_SEND_COMMAND:
- return
ioctl_by_bdev(pd->bdev
, cmd, arg);
+ return
blkdev_ioctl(pd->bdev->bd_inode, file
, cmd, arg);
case CDROMEJECT:
/*
case CDROMEJECT:
/*
@@
-2408,7
+2408,7
@@
static int pkt_ioctl(struct inode *inode, struct file *file, unsigned int cmd, u
* have to unlock it or else the eject command fails.
*/
pkt_lock_door(pd, 0);
* have to unlock it or else the eject command fails.
*/
pkt_lock_door(pd, 0);
- return
ioctl_by_bdev(pd->bdev
, cmd, arg);
+ return
blkdev_ioctl(pd->bdev->bd_inode, file
, cmd, arg);
default:
printk("pktcdvd: Unknown ioctl for %s (%x)\n", pd->name, cmd);
default:
printk("pktcdvd: Unknown ioctl for %s (%x)\n", pd->name, cmd);