char *c;
printf(" Magic : %08x\n", sb->md_magic);
- printf(" Version : %d.%02d.%02d\n", sb->major_version, sb->minor_version,
- sb->patch_version);
+ printf(" Version : %d.%02d.%02d\n",
+ sb->major_version, sb->minor_version, sb->patch_version);
if (sb->minor_version >= 90) {
- printf(" UUID : %08x:%08x:%08x:%08x", sb->set_uuid0, sb->set_uuid1,
- sb->set_uuid2, sb->set_uuid3);
+ printf(" UUID : %08x:%08x:%08x:%08x", sb->set_uuid0,
+ sb->set_uuid1, sb->set_uuid2, sb->set_uuid3);
if (homehost) {
char buf[20];
- void *hash = sha1_buffer(homehost,
- strlen(homehost),
- buf);
- if (memcmp(&sb->set_uuid2, hash, 8)==0)
+ void *hash;
+
+ hash = sha1_buffer(homehost, strlen(homehost), buf);
+ if (memcmp(&sb->set_uuid2, hash, 8) == 0)
printf(" (local to host %s)", homehost);
}
printf("\n");
atime = sb->ctime;
printf(" Creation Time : %.24s\n", ctime(&atime));
- c=map_num(pers, sb->level);
+ c = map_num(pers, sb->level);
printf(" Raid Level : %s\n", c?c:"-unknown-");
if ((int)sb->level > 0) {
int ddsks = 0, ddsks_denom = 1;
printf(" Used Dev Size : %d%s\n", sb->size,
human_size((long long)sb->size<<10));
switch(sb->level) {
- case 1: ddsks=1;break;
+ case 1:
+ ddsks=1;
+ break;
case 4:
- case 5: ddsks = sb->raid_disks-1; break;
- case 6: ddsks = sb->raid_disks-2; break;
- case 10: ddsks = sb->raid_disks;
- ddsks_denom = (sb->layout&255) * ((sb->layout>>8)&255);
+ case 5:
+ ddsks = sb->raid_disks - 1;
+ break;
+ case 6:
+ ddsks = sb->raid_disks - 2;
+ break;
+ case 10:
+ ddsks = sb->raid_disks;
+ ddsks_denom =
+ (sb->layout & 255) * ((sb->layout >> 8) & 255);
}
if (ddsks) {
long long asize = sb->size;
printf(" Total Devices : %d\n", sb->nr_disks);
printf("Preferred Minor : %d\n", sb->md_minor);
printf("\n");
- if (sb->minor_version > 90 && (sb->reshape_position+1) != 0) {
- printf(" Reshape pos'n : %llu%s\n", (unsigned long long)sb->reshape_position/2, human_size((long long)sb->reshape_position<<9));
+ if (sb->minor_version > 90 && (sb->reshape_position + 1) != 0) {
+ printf(" Reshape pos'n : %llu%s\n",
+ (unsigned long long)sb->reshape_position / 2,
+ human_size((long long)sb->reshape_position << 9));
if (sb->delta_disks) {
printf(" Delta Devices : %d", sb->delta_disks);
- printf(" (%d->%d)\n", sb->raid_disks-sb->delta_disks, sb->raid_disks);
+ printf(" (%d->%d)\n", sb->raid_disks-sb->delta_disks,
+ sb->raid_disks);
if (((int)sb->delta_disks) < 0)
delta_extra = - sb->delta_disks;
}
if (sb->new_layout != sb->layout) {
if (sb->level == 5) {
c = map_num(r5layout, sb->new_layout);
- printf(" New Layout : %s\n", c?c:"-unknown-");
+ printf(" New Layout : %s\n",
+ c?c:"-unknown-");
}
if (sb->level == 6) {
c = map_num(r6layout, sb->new_layout);
- printf(" New Layout : %s\n", c?c:"-unknown-");
+ printf(" New Layout : %s\n",
+ c?c:"-unknown-");
}
if (sb->level == 10) {
printf(" New Layout : near=%d, %s=%d\n",
atime = sb->utime;
printf(" Update Time : %.24s\n", ctime(&atime));
printf(" State : %s\n",
- (sb->state&(1<<MD_SB_CLEAN))?"clean":"active");
- if (sb->state & (1<<MD_SB_BITMAP_PRESENT))
+ (sb->state&(1 << MD_SB_CLEAN)) ? "clean":"active");
+ if (sb->state & (1 << MD_SB_BITMAP_PRESENT))
printf("Internal Bitmap : present\n");
printf(" Active Devices : %d\n", sb->active_disks);
printf("Working Devices : %d\n", sb->working_disks);
if (calc_sb0_csum(sb) == sb->sb_csum)
printf(" Checksum : %x - correct\n", sb->sb_csum);
else
- printf(" Checksum : %x - expected %lx\n", sb->sb_csum, calc_sb0_csum(sb));
+ printf(" Checksum : %x - expected %lx\n",
+ sb->sb_csum, calc_sb0_csum(sb));
printf(" Events : %llu\n",
- ((unsigned long long)sb->events_hi << 32)
- + sb->events_lo);
+ ((unsigned long long)sb->events_hi << 32) + sb->events_lo);
printf("\n");
if (sb->level == 5) {
c = map_num(r5layout, sb->layout);
case 5:
case 6:
case 10:
- printf(" Chunk Size : %dK\n", sb->chunk_size/1024);
+ printf(" Chunk Size : %dK\n", sb->chunk_size / 1024);
break;
case -1:
- printf(" Rounding : %dK\n", sb->chunk_size/1024);
+ printf(" Rounding : %dK\n", sb->chunk_size / 1024);
+ break;
+ default:
break;
- default: break;
}
printf("\n");
printf(" Number Major Minor RaidDevice State\n");
- for (d= -1; d<(signed int)(sb->raid_disks+delta_extra + sb->spare_disks); d++) {
+ for (d = -1;
+ d < (signed int)(sb->raid_disks + delta_extra + sb->spare_disks);
+ d++) {
mdp_disk_t *dp;
char *dv;
char nb[5];
if (d>=0) dp = &sb->disks[d];
else dp = &sb->this_disk;
snprintf(nb, sizeof(nb), "%4d", d);
- printf("%4s %5d %5d %5d %5d ", d < 0 ? "this" : nb,
+ printf("%4s %5d %5d %5d %5d ", d < 0 ? "this" : nb,
dp->number, dp->major, dp->minor, dp->raid_disk);
- wonly = dp->state & (1<<MD_DISK_WRITEMOSTLY);
- dp->state &= ~(1<<MD_DISK_WRITEMOSTLY);
- if (dp->state & (1<<MD_DISK_FAULTY)) printf(" faulty");
- if (dp->state & (1<<MD_DISK_ACTIVE)) printf(" active");
- if (dp->state & (1<<MD_DISK_SYNC)) printf(" sync");
- if (dp->state & (1<<MD_DISK_REMOVED)) printf(" removed");
- if (wonly) printf(" write-mostly");
- if (dp->state == 0) printf(" spare");
- if ((dv=map_dev(dp->major, dp->minor, 0)))
+ wonly = dp->state & (1 << MD_DISK_WRITEMOSTLY);
+ dp->state &= ~(1 << MD_DISK_WRITEMOSTLY);
+ if (dp->state & (1 << MD_DISK_FAULTY))
+ printf(" faulty");
+ if (dp->state & (1 << MD_DISK_ACTIVE))
+ printf(" active");
+ if (dp->state & (1 << MD_DISK_SYNC))
+ printf(" sync");
+ if (dp->state & (1 << MD_DISK_REMOVED))
+ printf(" removed");
+ if (wonly)
+ printf(" write-mostly");
+ if (dp->state == 0)
+ printf(" spare");
+ if ((dv = map_dev(dp->major, dp->minor, 0)))
printf(" %s", dv);
printf("\n");
- if (d == -1) printf("\n");
+ if (d == -1)
+ printf("\n");
}
}
info->array.utime = sb->utime;
info->array.chunk_size = sb->chunk_size;
info->array.state = sb->state;
- info->component_size = sb->size*2;
+ info->component_size = sb->size;
+ info->component_size *= 2;
if (sb->state & (1<<MD_SB_BITMAP_PRESENT))
info->bitmap_offset = 8;
pr_err("No active reshape to revert on %s\n",
devname);
else if (sb->delta_disks == 0)
- pr_err("%s: Can on revert reshape which changes number of devices\n",
+ pr_err("%s: Can only revert reshape which changes number of devices\n",
devname);
else {
int tmp;
int parity = sb->level == 6 ? 2 : 1;
rv = 0;
- if (sb->reshape_position % (
+ if (sb->level >= 4 && sb->level <= 6 &&
+ sb->reshape_position % (
sb->new_chunk/512 *
(sb->raid_disks - sb->delta_disks - parity))) {
pr_err("Reshape position is not suitably aligned.\n");
- pr_err("Try normal assembly as stop again\n");
+ pr_err("Try normal assembly and stop again\n");
return -2;
}
sb->raid_disks -= sb->delta_disks;
}
/*
- * For verion-0 superblock, the homehost is 'stored' in the
- * uuid. 8 bytes for a hash of the host leaving 8 bytes
- * of random material.
- * We use the first 8 bytes (64bits) of the sha1 of the
- * host name
+ * For version-0 superblock, the homehost is 'stored' in the uuid.
+ * 8 bytes for a hash of the host leaving 8 bytes of random material.
+ * We use the first 8 bytes (64bits) of the sha1 of the host name
*/
-
static int init_super0(struct supertype *st, mdu_array_info_t *info,
- unsigned long long size, char *ignored_name, char *homehost,
- int *uuid, unsigned long long data_offset)
+ unsigned long long size, char *ignored_name,
+ char *homehost, int *uuid,
+ unsigned long long data_offset)
{
mdp_super_t *sb;
int spares;
if (posix_memalign((void**)&sb, 4096,
MD_SB_BYTES + ROUND_UP(sizeof(bitmap_super_t), 4096)) != 0) {
- pr_err("%s could not allocate superblock\n", __func__);
+ pr_err("could not allocate superblock\n");
return 0;
}
memset(sb, 0, MD_SB_BYTES + sizeof(bitmap_super_t));
sb->set_uuid2 = uuid[2];
sb->set_uuid3 = uuid[3];
} else {
- int rfd = open("/dev/urandom", O_RDONLY);
- if (rfd < 0 || read(rfd, &sb->set_uuid0, 4) != 4)
- sb->set_uuid0 = random();
- if (rfd < 0 || read(rfd, &sb->set_uuid1, 12) != 12) {
- sb->set_uuid1 = random();
- sb->set_uuid2 = random();
- sb->set_uuid3 = random();
- }
- if (rfd >= 0)
- close(rfd);
+ __u32 r[4];
+ random_uuid((__u8 *)r);
+ sb->set_uuid0 = r[0];
+ sb->set_uuid1 = r[1];
+ sb->set_uuid2 = r[2];
+ sb->set_uuid3 = r[3];
}
if (homehost && !uuid) {
char buf[20];
dk->major = dinfo->major;
dk->minor = dinfo->minor;
dk->raid_disk = dinfo->raid_disk;
- dk->state = dinfo->state;
- /* In case our source disk was writemostly, don't copy that bit */
- dk->state &= ~(1<<MD_DISK_WRITEMOSTLY);
+ dk->state = dinfo->state & ((1<<MD_DISK_ACTIVE) |
+ (1<<MD_DISK_SYNC));
sb->this_disk = sb->disks[dinfo->number];
sb->sb_csum = calc_sb0_csum(sb);
for (di = st->info ; di && ! rv ; di = di->next) {
- if (di->disk.state == 1)
+ if (di->disk.state & (1 << MD_DISK_FAULTY))
continue;
if (di->fd == -1)
continue;
rv = store_super0(st, di->fd);
if (rv == 0 && (sb->state & (1<<MD_SB_BITMAP_PRESENT)))
- rv = st->ss->write_bitmap(st, di->fd);
+ rv = st->ss->write_bitmap(st, di->fd, NoUpdate);
if (rv)
pr_err("failed to write superblock to %s\n",
if (posix_memalign((void**)&first, 4096,
MD_SB_BYTES +
ROUND_UP(sizeof(struct bitmap_super_s), 4096)) != 0) {
- pr_err("%s could not allocate superblock\n", __func__);
+ pr_err("could not allocate superblock\n");
return 1;
}
memcpy(first, second, MD_SB_BYTES + sizeof(struct bitmap_super_s));
if (posix_memalign((void**)&super, 4096,
MD_SB_BYTES +
ROUND_UP(sizeof(bitmap_super_t), 4096)) != 0) {
- pr_err("%s could not allocate superblock\n", __func__);
+ pr_err("could not allocate superblock\n");
return 1;
}
if (chunk < 64*1024*1024)
chunk = 64*1024*1024;
} else if ((unsigned long long)chunk < min_chunk)
- return 0; /* chunk size too small */
+ return -EINVAL; /* chunk size too small */
sb->state |= (1<<MD_SB_BITMAP_PRESENT);
bms->sync_size = __cpu_to_le64(size);
bms->write_behind = __cpu_to_le32(write_behind);
*chunkp = chunk;
- return 1;
+ return 0;
}
-static void locate_bitmap0(struct supertype *st, int fd)
+static int locate_bitmap0(struct supertype *st, int fd, int node_num)
{
unsigned long long dsize;
unsigned long long offset;
if (!get_dev_size(fd, NULL, &dsize))
- return;
+ return -1;
if (dsize < MD_RESERVED_SECTORS*512)
- return;
+ return -1;
offset = MD_NEW_SIZE_SECTORS(dsize>>9);
offset += MD_SB_BYTES;
lseek64(fd, offset, 0);
+ return 0;
}
-static int write_bitmap0(struct supertype *st, int fd)
+static int write_bitmap0(struct supertype *st, int fd, enum bitmap_update update)
{
unsigned long long dsize;
unsigned long long offset;
}
if (size >= tbmax * 2ULL*1024*1024*1024) {
if (verbose)
- pr_err("0.90 metadata supports at most "
- "%d terabytes per device\n", tbmax);
+ pr_err("0.90 metadata supports at most %d terabytes per device\n", tbmax);
return 0;
}
- if (chunk && *chunk == UnSet)
+ if (*chunk == UnSet)
*chunk = DEFAULT_CHUNK;
if (!subdev)
projects / thirdparty / mdadm.git / blobdiff