summaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorJosef Sipek <jsipek@fsl.cs.sunysb.edu>2006-12-08 02:36:54 -0800
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-08 08:28:44 -0800
commitc5a20b6c26efb58c2ba2ebebcc65748f5b92f662 (patch)
tree5dd1a27835594b7f27620981bfded11255a418ab /block
parent61a8424ab8f611d199bfc8ca329ec0ea77a4d4ea (diff)
downloadop-kernel-dev-c5a20b6c26efb58c2ba2ebebcc65748f5b92f662.zip
op-kernel-dev-c5a20b6c26efb58c2ba2ebebcc65748f5b92f662.tar.gz
[PATCH] struct path: convert block
Signed-off-by: Josef Sipek <jsipek@fsl.cs.sunysb.edu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'block')
-rw-r--r--block/ioctl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/block/ioctl.c b/block/ioctl.c
index 9fddb99..f6962b6 100644
--- a/block/ioctl.c
+++ b/block/ioctl.c
@@ -290,7 +290,7 @@ int blkdev_ioctl(struct inode *inode, struct file *file, unsigned cmd,
ENOIOCTLCMD for unknown ioctls. */
long compat_blkdev_ioctl(struct file *file, unsigned cmd, unsigned long arg)
{
- struct block_device *bdev = file->f_dentry->d_inode->i_bdev;
+ struct block_device *bdev = file->f_path.dentry->d_inode->i_bdev;
struct gendisk *disk = bdev->bd_disk;
int ret = -ENOIOCTLCMD;
if (disk->fops->compat_ioctl) {
OpenPOWER on IntegriCloud