Merge home.transmeta.com:/home/torvalds/v2.5/viro

into home.transmeta.com:/home/torvalds/v2.5/linux

6 files changed, 9 insertions, 28 deletions

diff --git a/include/linux/blkpg.h b/include/linux/blkpg.h
index f58b6328e2bd..3cfedb07f803 100644
--- a/include/linux/blkpg.h
+++ b/include/linux/blkpg.h
@@ -56,7 +56,7 @@ struct blkpg_partition {
 
 #ifdef __KERNEL__
 
-extern char * partition_name(kdev_t dev);
+extern char * partition_name(dev_t dev);
 extern int blk_ioctl(struct block_device *bdev, unsigned int cmd, unsigned long arg);
 
 #endif /* __KERNEL__ */
diff --git a/include/linux/cdrom.h b/include/linux/cdrom.h
index 19a318fe8ce6..b287b7a24b11 100644
--- a/include/linux/cdrom.h
+++ b/include/linux/cdrom.h
@@ -730,9 +730,7 @@ struct cdrom_device_info {
 	struct cdrom_device_ops  *ops;  /* link to device_ops */
 	struct cdrom_device_info *next; /* next device_info for this major */
 	void *handle;		        /* driver-dependent data */
-	devfs_handle_t de;		/* real driver should create this  */
 	struct device cdrom_driverfs_dev; /* driverfs implementation */
-	int number;			/* generic driver updates this  */
 /* specifications */
         kdev_t dev;	                /* device number */
 	int mask;                       /* mask of capability: disables them */
@@ -787,18 +785,6 @@ extern int cdrom_media_changed(kdev_t);
 extern int register_cdrom(struct cdrom_device_info *cdi);
 extern int unregister_cdrom(struct cdrom_device_info *cdi);
 
-static inline void devfs_plain_cdrom(struct cdrom_device_info *cdi,
-				struct block_device_operations *ops)
-{
-	char vname[23];
-
-	sprintf (vname, "cdroms/cdrom%d", cdi->number);
-	cdi->de = devfs_register (NULL, vname, DEVFS_FL_DEFAULT,
-				    major(cdi->dev), minor(cdi->dev),
-				    S_IFBLK | S_IRUGO | S_IWUGO,
-				    ops, NULL);
-}
-
 typedef struct {
     int data;
     int audio;
diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index ecd747fbe569..33cfbe2f1108 100644
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -68,6 +68,7 @@ struct hd_struct {
 #define GENHD_FL_REMOVABLE  1
 #define GENHD_FL_DRIVERFS  2
 #define GENHD_FL_DEVFS	4
+#define GENHD_FL_CD	8
 
 struct gendisk {
 	int major;			/* major number of driver */
@@ -80,6 +81,7 @@ struct gendisk {
 	struct gendisk *next;
 	struct block_device_operations *fops;
 	sector_t capacity;
+	struct list_head list;
 
 	int flags;
 	int number;			/* devfs crap */
@@ -90,7 +92,7 @@ struct gendisk {
 };
 
 /* drivers/block/genhd.c */
-extern void add_gendisk(struct gendisk *gp);
+extern void add_disk(struct gendisk *disk);
 extern void del_gendisk(struct gendisk *gp);
 extern void unlink_gendisk(struct gendisk *gp);
 extern struct gendisk *get_gendisk(kdev_t dev);
@@ -259,6 +261,9 @@ char *disk_name (struct gendisk *hd, int part, char *buf);
 extern int rescan_partitions(struct gendisk *disk, struct block_device *bdev);
 extern void update_partition(struct gendisk *disk, int part);
 
+/* will go away */
+extern void blk_set_probe(int major, struct gendisk *(p)(int));
+
 static inline unsigned int disk_index (kdev_t dev)
 {
 	struct gendisk *g = get_gendisk(dev);
diff --git a/include/linux/nbd.h b/include/linux/nbd.h
index d2e9309f1a76..8e4b8c236e8b 100644
--- a/include/linux/nbd.h
+++ b/include/linux/nbd.h
@@ -79,6 +79,7 @@ struct nbd_device {
 	spinlock_t queue_lock;
 	struct list_head queue_head;	/* Requests are added here...			*/
 	struct semaphore tx_lock;
+	struct gendisk disk;
 };
 #endif
 
diff --git a/include/linux/raid/md.h b/include/linux/raid/md.h
index f95cdf658a39..e8acacc1adb2 100644
--- a/include/linux/raid/md.h
+++ b/include/linux/raid/md.h
@@ -62,10 +62,9 @@
 
 extern int md_size[MAX_MD_DEVS];
 
-extern char * partition_name (kdev_t dev);
 extern inline char * bdev_partition_name (struct block_device *bdev)
 {
-	return partition_name(bdev ? to_kdev_t(bdev->bd_dev) : NODEV);
+	return partition_name(bdev ? bdev->bd_dev : 0);
 }
 extern int register_md_personality (int p_num, mdk_personality_t *p);
 extern int unregister_md_personality (int p_num);
diff --git a/include/linux/raid/md_k.h b/include/linux/raid/md_k.h
index 3c88b7882227..2f72d0213f99 100644
--- a/include/linux/raid/md_k.h
+++ b/include/linux/raid/md_k.h
@@ -299,16 +299,6 @@ typedef struct mdk_thread_s {
 
 #define THREAD_WAKEUP  0
 
-#define MAX_DISKNAME_LEN 64
-
-typedef struct dev_name_s {
-	struct list_head list;
-	kdev_t dev;
-	char namebuf [MAX_DISKNAME_LEN];
-	char *name;
-} dev_name_t;
-
-
 #define __wait_event_lock_irq(wq, condition, lock) 			\
 do {									\
 	wait_queue_t __wait;						\