diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-05 06:47:02 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-05 06:47:02 +0000 |
| commit | 99a7e12f34b3661a0d1354eef83a0eef4df5e34c (patch) | |
| tree | 3560aca9ca86792f9ab7bd87861ea143a1b3c7a3 /drivers/block/nbd.c | |
| parent | e73a04659c0b8cdee4dd40e58630e2cf63afb316 (diff) | |
Merge with Linux 2.3.38.
Diffstat (limited to 'drivers/block/nbd.c')
| -rw-r--r-- | drivers/block/nbd.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index cda45cc01..4cf81b9b0 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c @@ -446,18 +446,11 @@ static int nbd_release(struct inode *inode, struct file *file) return 0; } -static struct file_operations nbd_fops = +static struct block_device_operations nbd_fops = { - NULL, /* lseek - default */ - block_read, /* read - general block-dev read */ - block_write, /* write - general block-dev write */ - NULL, /* readdir - bad */ - NULL, /* select */ - nbd_ioctl, /* ioctl */ - NULL, /* mmap */ - nbd_open, /* open */ - NULL, /* flush */ - nbd_release /* release */ + open: nbd_open, + release: nbd_release, + ioctl: nbd_ioctl, }; /* |