diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2008-03-02 09:24:35 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2008-10-21 07:47:44 -0400 |
| commit | 2b9ecd03335c7be9b8ce84f4499f4b6785a655ee (patch) | |
| tree | 85cf9b37cdbff0a92d892c54711443e425860b9c | |
| parent | 60ad23400717f70b8f0ee623b50d343d45f7b135 (diff) | |
| download | op-kernel-dev-2b9ecd03335c7be9b8ce84f4499f4b6785a655ee.zip op-kernel-dev-2b9ecd03335c7be9b8ce84f4499f4b6785a655ee.tar.gz | |
[PATCH] switch brd
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| -rw-r--r-- | drivers/block/brd.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/block/brd.c b/drivers/block/brd.c index 2ea99f9..bdd4f5f 100644 --- a/drivers/block/brd.c +++ b/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 |
