diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-24 12:48:46 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-24 12:48:46 +0200 |
| commit | 8c82a17e9c924c0e9f13e75e4c2f6bca19a4b516 (patch) | |
| tree | d535f46a917e14e90deccb29ad00aac016ad18dd /drivers/block/brd.c | |
| parent | 4ce72a2c063a7fa8e42a9435440ae3364115a58d (diff) | |
| parent | 57f8f7b60db6f1ed2c6918ab9230c4623a9dbe37 (diff) | |
| download | op-kernel-dev-8c82a17e9c924c0e9f13e75e4c2f6bca19a4b516.zip op-kernel-dev-8c82a17e9c924c0e9f13e75e4c2f6bca19a4b516.tar.gz | |
Merge commit 'v2.6.28-rc1' into sched/urgent
Diffstat (limited to 'drivers/block/brd.c')
| -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 d070d49..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 |
