Common subdirectories: raidtools/Software-RAID.HOWTO and raidtools-20010914/Software-RAID.HOWTO diff -U 10 raidtools/common.h raidtools-20010914/common.h --- raidtools/common.h Wed Oct 24 05:33:32 2001 +++ raidtools-20010914/common.h Tue Aug 28 08:26:13 2001 @@ -33,20 +33,20 @@ #define DEBUG (0) #define EXIT_USAGE (EXIT_FAILURE) #define EXIT_VERSION (0) #define MAX_LINE_LENGTH (100) #define ZERO_BUFFER_SIZE (64) /* 64kB */ #define MD_BLK_SIZ (0x400) #define RAID_CONFIG "/etc/raidtab" #define MKRAID_MAJOR_VERSION (0) -#define MKRAID_MINOR_VERSION (91) +#define MKRAID_MINOR_VERSION (90) #define MKRAID_PATCHLEVEL_VERSION (0) extern int do_quiet_flag; #define MIN(a,b) ((a) < (b) ? (a) : (b)) #define OUT(x...) do { if (!do_quiet_flag) fprintf(stderr,##x); } while (0) #define ERR(x...) fprintf(stderr,##x) #endif diff -U 10 raidtools/configure raidtools-20010914/configure --- raidtools/configure Wed Oct 24 07:13:52 2001 +++ raidtools-20010914/configure Tue Aug 28 08:27:29 2001 @@ -516,21 +516,21 @@ else ac_n=-n ac_c= ac_t= fi else ac_n= ac_c='\c' ac_t= fi -VERS=0.91 +VERS=0.90 MAKEFLAGS="-j4" # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo "configure:536: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then diff -U 10 raidtools/configure.in raidtools-20010914/configure.in --- raidtools/configure.in Wed Oct 24 07:14:37 2001 +++ raidtools-20010914/configure.in Tue Aug 28 08:26:15 2001 @@ -1,17 +1,17 @@ dnl dnl Configure.in file for the raidtools dnl AC_INIT(mkraid.c) AC_CONFIG_HEADER(config.h) -VERS=0.91 +VERS=0.90 AC_SUBST(VERS) dnl dnl doesnt hurt dnl MAKEFLAGS="-j4" AC_SUBST(MAKEFLAGS) dnl dnl Basic autoconf checking diff -U 10 raidtools/md-int.h raidtools-20010914/md-int.h --- raidtools/md-int.h Wed Oct 24 07:10:33 2001 +++ raidtools-20010914/md-int.h Tue Aug 28 08:26:19 2001 @@ -193,22 +193,21 @@ md_u32 working_disks; /* 3 Number of working disks */ md_u32 failed_disks; /* 4 Number of failed disks */ md_u32 spare_disks; /* 5 Number of spare disks */ md_u32 gstate_sreserved[MD_SB_GENERIC_STATE_WORDS - 6]; /* * Personality information */ md_u32 layout; /* 0 the array's physical layout */ md_u32 chunk_size; /* 1 chunk size in bytes */ - md_u32 routing; /* 2 routing algorithim for multipath drive */ - md_u32 pstate_reserved[MD_SB_PERSONALITY_WORDS - 3]; + md_u32 pstate_reserved[MD_SB_PERSONALITY_WORDS - 2]; /* * Disks information */ md_descriptor_t disks[MD_SB_DISKS]; /* * Reserved */ md_u32 reserved[MD_SB_RESERVED_WORDS]; @@ -221,25 +220,23 @@ } md_superblock_t; /* * options passed in raidstart: */ #define MAX_CHUNK_SIZE (4096*1024) struct md_param { - int personality; /* 1,2,3,4 */ - int chunk_size; /* in bytes */ - int max_fault; /* unused for now */ - int routing; /* routing algorithim for multipath devices */ - int routing_param; /* arguments to routing algorithim */ + int personality; /* 1,2,3,4 */ + int chunk_size; /* in bytes */ + int max_fault; /* unused for now */ }; typedef struct md_array_info_s { /* * Generic constant information */ md_u32 major_version; md_u32 minor_version; md_u32 patch_version; md_u32 ctime; @@ -258,21 +255,20 @@ md_u32 active_disks; /* 2 Number of currently active disks */ md_u32 working_disks; /* 3 Number of working disks */ md_u32 failed_disks; /* 4 Number of failed disks */ md_u32 spare_disks; /* 5 Number of spare disks */ /* * Personality information */ md_u32 layout; /* 0 the array's physical layout */ md_u32 chunk_size; /* 1 chunk size in bytes */ - md_u32 routing; /* 2 routing algorithim for multipath device */ } md_array_info_t; typedef struct md_disk_info_s { /* * configuration/status of one particular disk */ md_u32 number; md_u32 major; md_u32 minor; diff -U 10 raidtools/mkpv.c raidtools-20010914/mkpv.c --- raidtools/mkpv.c Wed Oct 24 07:14:11 2001 +++ raidtools-20010914/mkpv.c Tue Aug 28 08:27:11 2001 @@ -16,21 +16,21 @@ #include #include /* for BLKGETSIZE */ #ifndef BLKGETSIZE #include /* for BLKGETSIZE */ #endif #include #include "lvm-int.h" #define MKPV_MAJOR_VERSION (0) -#define MKPV_MINOR_VERSION (91) +#define MKPV_MINOR_VERSION (90) #define MKPV_PATCHLEVEL_VERSION (0) void usage (void) { printf("usage: mkpv [--configfile] [--version] [--force]\n"); printf(" [-acfhuv] *\n"); } static long long lvmseek (int fd, unsigned long block) { return (raidseek(fd, block*(LVM_BLOCKSIZE/MD_BLK_SIZ))); diff -U 10 raidtools/parser.c raidtools-20010914/parser.c --- raidtools/parser.c Wed Oct 24 05:37:53 2001 +++ raidtools-20010914/parser.c Tue Aug 28 08:27:13 2001 @@ -202,27 +202,20 @@ if (val >= array->param.raid_disks) { fprintf(stderr, "failed-disk should be smaller than raid_disks\n"); return 1; } i = array->param.nr_disks - 1; array->disks[i].raid_disk = val; array->disks[i].state |= (1 << MD_DISK_FAULTY); array->param.failed_disks++; return 0; - } else if (strcmp(par, "routing") == 0) { - if (array->param.level != -4) { - fprintf(stderr, "routing parameter only valid for multipath devices\n"); - return 1; - } - array->param.routing = val; - return 0; } fprintf(stderr, "unrecognized option %s\n", par); return 1; } int parse_config (FILE *fp) { int nr = 0; char line[MAX_LINE_LENGTH], par[MAX_LINE_LENGTH], val[MAX_LINE_LENGTH]; diff -U 10 raidtools/raid_io.c raidtools-20010914/raid_io.c --- raidtools/raid_io.c Wed Oct 24 07:35:19 2001 +++ raidtools-20010914/raid_io.c Tue Aug 28 08:27:15 2001 @@ -232,22 +232,20 @@ printf("State: %d%s\n", sb->state, sb->state & (1 << MD_SB_CLEAN) ? " (clean)" : ""); printf("Raid level: %d\n", sb->level); printf("Individual disk size: %uMB (%ukB)\n", sb->size / MD_BLK_SIZ, sb->size); if (sb->level == 4 || sb->level == 5) printf("Chunk size: %dkB\n", sb->chunk_size / MD_BLK_SIZ); i = sb->layout; if (sb->level == 5) printf("Parity algorithm: %d (%s)\n", i, i < 4 ? parity_algorithm_table[i] : "unknown"); - if (sb->level == -4) - printf("Routing algorithim: %d\n", sb->routing ); printf("Total number of disks: %d\n", sb->nr_disks); printf("Number of raid disks: %d\n", sb->raid_disks); printf("Number of active disks: %d\n", sb->active_disks); printf("Number of working disks: %d\n", sb->working_disks); printf("Number of failed disks: %d\n", sb->failed_disks); printf("Number of spare disks: %d\n", sb->spare_disks); printf("\n"); for (i = 0; i < sb->nr_disks; i++) { disk = sb->disks + i; diff -U 10 raidtools/raidlib.c raidtools-20010914/raidlib.c --- raidtools/raidlib.c Wed Oct 24 07:38:42 2001 +++ raidtools-20010914/raidlib.c Tue Aug 28 08:27:17 2001 @@ -412,22 +412,20 @@ case -1: param.personality = LINEAR; break; case 0: param.personality = RAID0; break; case 1: param.personality = RAID1; break; case 4: case 5: param.personality = RAID5; break; default: exit (EXIT_FAILURE); } param.chunk_size = cfg->array.param.chunk_size; - param.routing = cfg->array.param.routing; - fd = open_or_die(cfg->md_name); if (do_mdrun (fd, cfg->md_name, ¶m)) rc++; break; case raidstop: return 1; case raidstop_ro: return 1;