diff options
Diffstat (limited to 'kernel/include/linux/device-mapper.h')
| -rw-r--r-- | kernel/include/linux/device-mapper.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/kernel/include/linux/device-mapper.h b/kernel/include/linux/device-mapper.h index 51cc1deb7..ec1c61c87 100644 --- a/kernel/include/linux/device-mapper.h +++ b/kernel/include/linux/device-mapper.h @@ -79,11 +79,8 @@ typedef void (*dm_status_fn) (struct dm_target *ti, status_type_t status_type, typedef int (*dm_message_fn) (struct dm_target *ti, unsigned argc, char **argv); -typedef int (*dm_ioctl_fn) (struct dm_target *ti, unsigned int cmd, - unsigned long arg); - -typedef int (*dm_merge_fn) (struct dm_target *ti, struct bvec_merge_data *bvm, - struct bio_vec *biovec, int max_size); +typedef int (*dm_prepare_ioctl_fn) (struct dm_target *ti, + struct block_device **bdev, fmode_t *mode); /* * These iteration functions are typically used to check (and combine) @@ -159,8 +156,7 @@ struct target_type { dm_resume_fn resume; dm_status_fn status; dm_message_fn message; - dm_ioctl_fn ioctl; - dm_merge_fn merge; + dm_prepare_ioctl_fn prepare_ioctl; dm_busy_fn busy; dm_iterate_devices_fn iterate_devices; dm_io_hints_fn io_hints; |