summaryrefslogtreecommitdiff
path: root/misc/fsck.c
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2000-10-25 02:06:09 +0000
committerTheodore Ts'o <tytso@mit.edu>2000-10-25 02:06:09 +0000
commit438196669574f87493b153b2dee93f5eeba1844e (patch)
tree96e492fe4bb585f1c8ce8729f6deedc2088ea1b3 /misc/fsck.c
parent8394902e04e64ed10ca81e869892c00143ee4931 (diff)
downloade2fsprogs-438196669574f87493b153b2dee93f5eeba1844e.tar.gz
ChangeLog, llseek.c:
llseek.c: Add #ifdef's for IA64 (it's a 64-bit platform, so we don't need to use llseek). ChangeLog, fsck.c: fsck.c (device_already_active): Add a special case check for MD devices, so we don't try to check them in parallel with other devices.
Diffstat (limited to 'misc/fsck.c')
-rw-r--r--misc/fsck.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/misc/fsck.c b/misc/fsck.c
index 981ec27f..52027119 100644
--- a/misc/fsck.c
+++ b/misc/fsck.c
@@ -103,6 +103,7 @@ static const char *base_devices[] = {
NULL
};
#else
+#define BASE_MD "/dev/md"
static const char *base_devices[] = {
"/dev/hda",
"/dev/hdb",
@@ -123,6 +124,7 @@ static const char *base_devices[] = {
"/dev/sde",
"/dev/sdf",
"/dev/sdg",
+ BASE_MD,
NULL
};
#endif
@@ -748,6 +750,14 @@ static int device_already_active(char *device)
if (force_all_parallel)
return 0;
+#ifdef BASE_MD
+ /* Don't check a soft raid disk with any other disk */
+ if (instance_list &&
+ (!strncmp(instance_list->device, BASE_MD, sizeof(BASE_MD)-1) ||
+ !strncmp(device, BASE_MD, sizeof(BASE_MD)-1)))
+ return 1;
+#endif
+
for (inst = instance_list; inst; inst = inst->next) {
if (!strcmp(base, base_device(inst->device)))
return 1;