Skip to content

L
linux-davinci
Commit 2b9ecd03 authored by Al Viro's avatar Al Viro
Browse files
Options

[PATCH] switch brd 

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 60ad2340
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
drivers/block/brd.c
View file @ 2b9ecd03
...@@ -340,11 +340,10 @@ static int brd_direct_access (struct block_device *bdev, sector_t sector, ...@@ -340,11 +340,10 @@ static int brd_direct_access (struct block_device *bdev, sector_t sector,
} }
#endif #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) unsigned int cmd, unsigned long arg)
{ {
int error; int error;
struct block_device *bdev = inode->i_bdev;
struct brd_device *brd = bdev->bd_disk->private_data; struct brd_device *brd = bdev->bd_disk->private_data;
if (cmd != BLKFLSBUF) if (cmd != BLKFLSBUF)
...@@ -376,7 +375,7 @@ static int brd_ioctl(struct inode *inode, struct file *file, ...@@ -376,7 +375,7 @@ static int brd_ioctl(struct inode *inode, struct file *file,
static struct block_device_operations brd_fops = { static struct block_device_operations brd_fops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.__ioctl = brd_ioctl, .locked_ioctl = brd_ioctl,
#ifdef CONFIG_BLK_DEV_XIP #ifdef CONFIG_BLK_DEV_XIP
.direct_access = brd_direct_access, .direct_access = brd_direct_access,
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment