---

yaml --- r: 117511 b: refs/heads/master c: 2b9ecd0 h: refs/heads/master i: 117509: ed06731 117507: 3b7b761 117503: 5c62248 v: v3
git-mirror · Oct 21, 2008 · 2a78f7d · 2a78f7d
1 parent 3ed98b7
commit 2a78f7d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git 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
@@ -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