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/hd.c | |
| parent | e73a04659c0b8cdee4dd40e58630e2cf63afb316 (diff) | |
Merge with Linux 2.3.38.
Diffstat (limited to 'drivers/block/hd.c')
| -rw-r--r-- | drivers/block/hd.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/drivers/block/hd.c b/drivers/block/hd.c index 8cf37c3de..e6d03518e 100644 --- a/drivers/block/hd.c +++ b/drivers/block/hd.c @@ -793,18 +793,10 @@ static void hd_geninit(struct gendisk *ignored) hardsect_size[MAJOR_NR] = hd_hardsectsizes; } -static struct file_operations hd_fops = { - NULL, /* lseek - default */ - block_read, /* read - general block-dev read */ - block_write, /* write - general block-dev write */ - NULL, /* readdir - bad */ - NULL, /* poll */ - hd_ioctl, /* ioctl */ - NULL, /* mmap */ - hd_open, /* open */ - NULL, /* flush */ - hd_release, /* release */ - block_fsync /* fsync */ +static struct block_device_operations hd_fops = { + open: hd_open, + release: hd_release, + ioctl: hd_ioctl, }; int __init hd_init(void) |