diff options
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/cdrom.h | 9 | ||||
| -rw-r--r-- | include/linux/fs.h | 4 | ||||
| -rw-r--r-- | include/linux/genhd.h | 10 | ||||
| -rw-r--r-- | include/linux/ide.h | 13 |
4 files changed, 15 insertions, 21 deletions
diff --git a/include/linux/cdrom.h b/include/linux/cdrom.h index 4387203c95b7..7ac3926382f8 100644 --- a/include/linux/cdrom.h +++ b/include/linux/cdrom.h @@ -731,7 +731,6 @@ struct cdrom_device_info { struct cdrom_device_info *next; /* next device_info for this major */ void *handle; /* driver-dependent data */ /* specifications */ - kdev_t dev; /* device number */ int mask; /* mask of capability: disables them */ int speed; /* maximum speed for reading data */ int capacity; /* number of discs in jukebox */ @@ -776,10 +775,10 @@ struct cdrom_device_ops { }; /* the general block_device operations structure: */ -extern int cdrom_open(struct inode *, struct file *); -extern int cdrom_release(struct inode *, struct file *); -extern int cdrom_ioctl(struct inode *, struct file *, unsigned, unsigned long); -extern int cdrom_media_changed(kdev_t); +extern int cdrom_open(struct cdrom_device_info *, struct inode *, struct file *); +extern int cdrom_release(struct cdrom_device_info *, struct file *); +extern int cdrom_ioctl(struct cdrom_device_info *, struct inode *, unsigned, unsigned long); +extern int cdrom_media_changed(struct cdrom_device_info *); extern int register_cdrom(struct cdrom_device_info *cdi); extern int unregister_cdrom(struct cdrom_device_info *cdi); diff --git a/include/linux/fs.h b/include/linux/fs.h index e5ced4dc214a..c2e39a247227 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -730,8 +730,8 @@ struct block_device_operations { int (*open) (struct inode *, struct file *); int (*release) (struct inode *, struct file *); int (*ioctl) (struct inode *, struct file *, unsigned, unsigned long); - int (*check_media_change) (kdev_t); - int (*revalidate) (kdev_t); + int (*media_changed) (struct gendisk *); + int (*revalidate_disk) (struct gendisk *); struct module *owner; }; diff --git a/include/linux/genhd.h b/include/linux/genhd.h index 9de2f51ae935..8cd8a826bf6f 100644 --- a/include/linux/genhd.h +++ b/include/linux/genhd.h @@ -80,6 +80,8 @@ struct gendisk { char disk_name[16]; /* name of major driver */ struct hd_struct *part; /* [indexed by minor] */ struct block_device_operations *fops; + struct request_queue *queue; + void *private_data; sector_t capacity; struct list_head list; struct list_head full_list; @@ -273,8 +275,12 @@ extern struct gendisk *alloc_disk(int minors); extern struct gendisk *get_disk(struct gendisk *disk); extern void put_disk(struct gendisk *disk); -/* will go away */ -extern void blk_set_probe(int major, struct gendisk *(p)(int)); +extern void blk_register_region(dev_t dev, unsigned long range, + struct module *module, + struct gendisk *(*probe)(dev_t, int *, void *), + void (*lock)(dev_t, void *), + void *data); +extern void blk_unregister_region(dev_t dev, unsigned long range); #endif diff --git a/include/linux/ide.h b/include/linux/ide.h index 44cb38c00b96..607464f740f5 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h @@ -1256,7 +1256,6 @@ extern int noautodma; */ #define IDE_DRIVER /* Toggle some magic bits in blk.h */ #define LOCAL_END_REQUEST /* Don't generate end_request in blk.h */ -#define DEVICE_NR(device) (minor(device) >> PARTN_BITS) #include <linux/blk.h> extern int ide_end_request (ide_drive_t *drive, int uptodate, int nrsecs); @@ -1316,12 +1315,7 @@ extern int ide_wait_stat(ide_startstop_t *, ide_drive_t *, u8, u8, unsigned long * This routine is called from the partition-table code in genhd.c * to "convert" a drive to a logical geometry with fewer than 1024 cyls. */ -extern int ide_xlate_1024 (kdev_t, int, int, const char *); - -/* - * Convert kdev_t structure into ide_drive_t * one. - */ -extern ide_drive_t *get_info_ptr (kdev_t i_rdev); +extern int ide_xlate_1024(struct block_device *, int, int, const char *); /* * Return the current idea about the total capacity of this drive. @@ -1577,11 +1571,6 @@ extern int ide_system_bus_speed(void); extern void ide_stall_queue(ide_drive_t *drive, unsigned long timeout); /* - * ide_get_queue() returns the queue which corresponds to a given device. - */ -extern request_queue_t *ide_get_queue (kdev_t dev); - -/* * CompactFlash cards and their brethern pretend to be removable hard disks, * but they never have a slave unit, and they don't have doorlock mechanisms. * This test catches them, and is invoked elsewhere when setting appropriate |