Commit 8b2b5c21 authored by NeilBrown's avatar NeilBrown

md: move LEVEL_* definition from md_k.h to md_u.h

.. as they are part of the user-space interface.
Also move MdpMinorShift into there so we can remove duplication.

Lastly move mdp_major in.  It is less obviously part of the user-space
interface, but do_mounts_md.c uses it, and it is acting a bit like
user-space.
Signed-off-by: default avatarNeilBrown <neilb@suse.de>
parent ef740c37
......@@ -46,9 +46,6 @@
#include <linux/delay.h>
#include "bitmap.h"
/* 63 partitions with the alternate major number (mdp) */
#define MdpMinorShift 6
#define DEBUG 0
#define dprintk(x...) ((void)(DEBUG && printk(x)))
......
......@@ -52,8 +52,6 @@
*/
#define MD_PATCHLEVEL_VERSION 3
extern int mdp_major;
extern int register_md_personality(struct mdk_personality *p);
extern int unregister_md_personality(struct mdk_personality *p);
extern mdk_thread_t * md_register_thread(void (*run) (mddev_t *mddev),
......
......@@ -20,16 +20,6 @@
#ifdef CONFIG_BLOCK
#define LEVEL_MULTIPATH (-4)
#define LEVEL_LINEAR (-1)
#define LEVEL_FAULTY (-5)
/* we need a value for 'no level specified' and 0
* means 'raid0', so we need something else. This is
* for internal use only
*/
#define LEVEL_NONE (-1000000)
#define MaxSector (~(sector_t)0)
typedef struct mddev_s mddev_t;
......
......@@ -46,6 +46,12 @@
#define STOP_ARRAY_RO _IO (MD_MAJOR, 0x33)
#define RESTART_ARRAY_RW _IO (MD_MAJOR, 0x34)
/* 63 partitions with the alternate major number (mdp) */
#define MdpMinorShift 6
#ifdef __KERNEL__
extern int mdp_major;
#endif
typedef struct mdu_version_s {
int major;
int minor;
......@@ -85,6 +91,17 @@ typedef struct mdu_array_info_s {
} mdu_array_info_t;
/* non-obvious values for 'level' */
#define LEVEL_MULTIPATH (-4)
#define LEVEL_LINEAR (-1)
#define LEVEL_FAULTY (-5)
/* we need a value for 'no level specified' and 0
* means 'raid0', so we need something else. This is
* for internal use only
*/
#define LEVEL_NONE (-1000000)
typedef struct mdu_disk_info_s {
/*
* configuration/status of one particular disk
......
......@@ -112,8 +112,6 @@ static int __init md_setup(char *str)
return 1;
}
#define MdpMinorShift 6
static void __init md_setup_drive(void)
{
int minor, i, ent, partitioned;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment