From 4772c1a90a76112dde66b1fece313cabe57032d6 Mon Sep 17 00:00:00 2001
From: Josef Sipek <jsipek@fsl.cs.sunysb.edu>
Date: Fri, 8 Dec 2006 02:36:54 -0800
Subject: [PATCH] --- yaml --- r: 43554 b: refs/heads/master c:
 c5a20b6c26efb58c2ba2ebebcc65748f5b92f662 h: refs/heads/master v: v3

---
 [refs]              | 2 +-
 trunk/block/ioctl.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 21eb225d2d74..4489baf05e56 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 61a8424ab8f611d199bfc8ca329ec0ea77a4d4ea
+refs/heads/master: c5a20b6c26efb58c2ba2ebebcc65748f5b92f662
diff --git a/trunk/block/ioctl.c b/trunk/block/ioctl.c
index 9fddb99c3efb..f6962b64660e 100644
--- a/trunk/block/ioctl.c
+++ b/trunk/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) {