diff options
| author | Adam Kwolek <adam.kwolek@intel.com> | 2011-06-09 13:00:54 +1000 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2011-06-09 13:00:54 +1000 |
| commit | 2e062e82102a5ee6c430e036a59071b9f1a5c475 (patch) | |
| tree | b271ffea9c1347349e61bcf487b60316ef68ba70 | |
| parent | 6b7a407dceb603d62f8f650b9753fb35afa72b47 (diff) | |
| download | mdadm-2e062e82102a5ee6c430e036a59071b9f1a5c475.tar.gz | |
imsm: FIX: Verify if migration record is loaded correctly
Migration compatibility can be checked when general migration record
is present.
Signed-off-by: Adam Kwolek <adam.kwolek@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
| -rw-r--r-- | super-intel.c | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/super-intel.c b/super-intel.c index d8070be..ad5e79c 100644 --- a/super-intel.c +++ b/super-intel.c @@ -3038,8 +3038,8 @@ static int load_imsm_mpb(int fd, struct intel_super *super, char *devname) if (lseek64(fd, dsize - (512 * 2), SEEK_SET) < 0) { if (devname) - fprintf(stderr, - Name ": Cannot seek to anchor block on %s: %s\n", + fprintf(stderr, Name + ": Cannot seek to anchor block on %s: %s\n", devname, strerror(errno)); return 1; } @@ -3836,16 +3836,17 @@ static int load_super_imsm(struct supertype *st, int fd, char *devname) } /* load migration record */ - load_imsm_migr_rec(super, NULL); - - /* Check for unsupported migration features */ - if (check_mpb_migr_compatibility(super) != 0) { - fprintf(stderr, Name ": Unsupported migration detected"); - if (devname) - fprintf(stderr, " on %s\n", devname); - else - fprintf(stderr, " (IMSM).\n"); - return 3; + if (load_imsm_migr_rec(super, NULL) == 0) { + /* Check for unsupported migration features */ + if (check_mpb_migr_compatibility(super) != 0) { + fprintf(stderr, + Name ": Unsupported migration detected"); + if (devname) + fprintf(stderr, " on %s\n", devname); + else + fprintf(stderr, " (IMSM).\n"); + return 3; + } } return 0; @@ -7762,7 +7763,12 @@ abort: int save_checkpoint_imsm(struct supertype *st, struct mdinfo *info, int state) { struct intel_super *super = st->sb; - load_imsm_migr_rec(super, info); + if (load_imsm_migr_rec(super, info) != 0) { + dprintf("imsm: ERROR: Cannot read migration record " + "for checkpoint save.\n"); + return 1; + } + if (__le32_to_cpu(super->migr_rec->blocks_per_unit) == 0) { dprintf("ERROR: blocks_per_unit = 0!!!\n"); return 1; |