projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
[powerpc.git]
/
include
/
linux
/
raid
/
md_k.h
diff --git
a/include/linux/raid/md_k.h
b/include/linux/raid/md_k.h
index
d288902
..
8245c28
100644
(file)
--- a/
include/linux/raid/md_k.h
+++ b/
include/linux/raid/md_k.h
@@
-18,6
+18,8
@@
/* and dm-bio-list.h is not under include/linux because.... ??? */
#include "../../../drivers/md/dm-bio-list.h"
/* and dm-bio-list.h is not under include/linux because.... ??? */
#include "../../../drivers/md/dm-bio-list.h"
+#ifdef CONFIG_BLOCK
+
#define LEVEL_MULTIPATH (-4)
#define LEVEL_LINEAR (-1)
#define LEVEL_FAULTY (-5)
#define LEVEL_MULTIPATH (-4)
#define LEVEL_LINEAR (-1)
#define LEVEL_FAULTY (-5)
@@
-29,18
+31,15
@@
#define LEVEL_NONE (-1000000)
#define MaxSector (~(sector_t)0)
#define LEVEL_NONE (-1000000)
#define MaxSector (~(sector_t)0)
-#define MD_THREAD_NAME_MAX 14
typedef struct mddev_s mddev_t;
typedef struct mdk_rdev_s mdk_rdev_t;
typedef struct mddev_s mddev_t;
typedef struct mdk_rdev_s mdk_rdev_t;
-#define MAX_MD_DEVS 256 /* Max number of md dev */
-
/*
* options passed in raidrun:
*/
/*
* options passed in raidrun:
*/
-/* Currently this must fi
x
in an 'int' */
+/* Currently this must fi
t
in an 'int' */
#define MAX_CHUNK_SIZE (1<<30)
/*
#define MAX_CHUNK_SIZE (1<<30)
/*
@@
-114,7
+113,11
@@
struct mddev_s
dev_t unit;
int md_minor;
struct list_head disks;
dev_t unit;
int md_minor;
struct list_head disks;
- int sb_dirty;
+ unsigned long flags;
+#define MD_CHANGE_DEVS 0 /* Some device status has changed */
+#define MD_CHANGE_CLEAN 1 /* transition to or from 'clean' */
+#define MD_CHANGE_PENDING 2 /* superblock update in progress */
+
int ro;
struct gendisk *gendisk;
int ro;
struct gendisk *gendisk;
@@
-362,5
+365,6
@@
static inline void safe_put_page(struct page *p)
if (p) put_page(p);
}
if (p) put_page(p);
}
+#endif /* CONFIG_BLOCK */
#endif
#endif