From 480561a58aa1457fa190d322c4686efda4992a0f Mon Sep 17 00:00:00 2001
From: Stephen Tweedie <sct@redhat.com>
Date: Fri, 13 May 2005 23:31:19 -0400
Subject: [PATCH] --- yaml --- r: 1119 b: refs/heads/master c:
 68f66feb300423bb9ee5daecb1951af394425a38 h: refs/heads/master i:   1117:
 e291722e0b92983a4d969ead7595d0ca9471b1fa   1115:
 0a50becb7119e70c9e96a73b1be439ad864e6c47   1111:
 d0d76f33e6922d605b0f70cdf0ff137158abc6e8   1103:
 42e1260e673f7e9b0f4cde5ccf57137d26ebf14d   1087:
 7cd58aec3bd4f5a735a84e39081df8c706e1ebf2 v: v3

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

diff --git a/[refs] b/[refs]
index f4947285f67c..6fbfda2ac30a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a84a505956f5c795a9ab3d60d97b6b91a27aa571
+refs/heads/master: 68f66feb300423bb9ee5daecb1951af394425a38
diff --git a/trunk/drivers/block/ioctl.c b/trunk/drivers/block/ioctl.c
index 5e03f5157ef9..6d7bcc9da9e7 100644
--- a/trunk/drivers/block/ioctl.c
+++ b/trunk/drivers/block/ioctl.c
@@ -237,3 +237,5 @@ long compat_blkdev_ioctl(struct file *file, unsigned cmd, unsigned long arg)
 	}
 	return ret;
 }
+
+EXPORT_SYMBOL_GPL(blkdev_ioctl);
diff --git a/trunk/drivers/char/raw.c b/trunk/drivers/char/raw.c
index a2e33ec79615..131465e8de5a 100644
--- a/trunk/drivers/char/raw.c
+++ b/trunk/drivers/char/raw.c
@@ -122,7 +122,7 @@ raw_ioctl(struct inode *inode, struct file *filp,
 {
 	struct block_device *bdev = filp->private_data;
 
-	return ioctl_by_bdev(bdev, command, arg);
+	return blkdev_ioctl(bdev->bd_inode, filp, command, arg);
 }
 
 static void bind_device(struct raw_config_request *rq)