diff options
Diffstat (limited to 'drivers/block')
-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 2ea99f947667..bdd4f5f45575 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, | |||
340 | } | 340 | } |
341 | #endif | 341 | #endif |
342 | 342 | ||
343 | static int brd_ioctl(struct inode *inode, struct file *file, | 343 | static int brd_ioctl(struct block_device *bdev, fmode_t mode, |
344 | unsigned int cmd, unsigned long arg) | 344 | unsigned int cmd, unsigned long arg) |
345 | { | 345 | { |
346 | int error; | 346 | int error; |
347 | struct block_device *bdev = inode->i_bdev; | ||
348 | struct brd_device *brd = bdev->bd_disk->private_data; | 347 | struct brd_device *brd = bdev->bd_disk->private_data; |
349 | 348 | ||
350 | if (cmd != BLKFLSBUF) | 349 | if (cmd != BLKFLSBUF) |
@@ -376,7 +375,7 @@ static int brd_ioctl(struct inode *inode, struct file *file, | |||
376 | 375 | ||
377 | static struct block_device_operations brd_fops = { | 376 | static struct block_device_operations brd_fops = { |
378 | .owner = THIS_MODULE, | 377 | .owner = THIS_MODULE, |
379 | .__ioctl = brd_ioctl, | 378 | .locked_ioctl = brd_ioctl, |
380 | #ifdef CONFIG_BLK_DEV_XIP | 379 | #ifdef CONFIG_BLK_DEV_XIP |
381 | .direct_access = brd_direct_access, | 380 | .direct_access = brd_direct_access, |
382 | #endif | 381 | #endif |