From 2a78f7d9d4d1ba2522457de5bd24cd17b7999d8b Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Sun, 2 Mar 2008 09:24:35 -0500
Subject: [PATCH] --- yaml --- r: 117511 b: refs/heads/master c:
 2b9ecd03335c7be9b8ce84f4499f4b6785a655ee h: refs/heads/master i:   117509:
 ed06731b2f23fabe3edede7ed6339d2b4570b6ce   117507:
 3b7b7612b4f74b00304cc030b013e932aad0928d   117503:
 5c622485b446a4bf3a1be5601e17024cc9f41dc7 v: v3

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

diff --git a/[refs] b/[refs]
index 58d2c527dbf6..2ef13d1a0f87 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 60ad23400717f70b8f0ee623b50d343d45f7b135
+refs/heads/master: 2b9ecd03335c7be9b8ce84f4499f4b6785a655ee
diff --git a/trunk/drivers/block/brd.c b/trunk/drivers/block/brd.c
index 2ea99f947667..bdd4f5f45575 100644
--- a/trunk/drivers/block/brd.c
+++ b/trunk/drivers/block/brd.c
@@ -340,11 +340,10 @@ static int brd_direct_access (struct block_device *bdev, sector_t sector,
 }
 #endif
 
-static int brd_ioctl(struct inode *inode, struct file *file,
+static int brd_ioctl(struct block_device *bdev, fmode_t mode,
 			unsigned int cmd, unsigned long arg)
 {
 	int error;
-	struct block_device *bdev = inode->i_bdev;
 	struct brd_device *brd = bdev->bd_disk->private_data;
 
 	if (cmd != BLKFLSBUF)
@@ -376,7 +375,7 @@ static int brd_ioctl(struct inode *inode, struct file *file,
 
 static struct block_device_operations brd_fops = {
 	.owner =		THIS_MODULE,
-	.__ioctl =		brd_ioctl,
+	.locked_ioctl =		brd_ioctl,
 #ifdef CONFIG_BLK_DEV_XIP
 	.direct_access =	brd_direct_access,
 #endif