summaryrefslogtreecommitdiff
path: root/include/linux/raid
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux/raid')
-rw-r--r--include/linux/raid/md.h3
-rw-r--r--include/linux/raid/md_k.h10
2 files changed, 1 insertions, 12 deletions
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; \