return __cpu_to_le32(csum);
}
+/*
+ * Information related to file descriptor used for aligned reads/writes.
+ * Cache the block size.
+ */
+struct align_fd {
+ int fd;
+ int blk_sz;
+};
+
+static void init_afd(struct align_fd *afd, int fd)
+{
+ afd->fd = fd;
+
+ if (ioctl(afd->fd, BLKSSZGET, &afd->blk_sz) != 0)
+ afd->blk_sz = 512;
+}
+
static char abuf[4096+4096];
-static int aread(int fd, void *buf, int len)
+static int aread(struct align_fd *afd, void *buf, int len)
{
/* aligned read.
* On devices with a 4K sector size, we need to read
int bsize, iosize;
char *b;
int n;
- if (ioctl(fd, BLKSSZGET, &bsize) != 0)
- bsize = 512;
- if (bsize > 4096 || len > 4096)
+ bsize = afd->blk_sz;
+
+ if (!bsize || bsize > 4096 || len > 4096) {
+ if (!bsize)
+ fprintf(stderr, "WARNING - aread() called with "
+ "invalid block size\n");
return -1;
- b = (char*)(((long)(abuf+4096))&~4095UL);
+ }
+ b = ROUND_UP_PTR((char *)abuf, 4096);
for (iosize = 0; iosize < len; iosize += bsize)
;
- n = read(fd, b, iosize);
+ n = read(afd->fd, b, iosize);
if (n <= 0)
return n;
- lseek(fd, len - n, 1);
+ lseek(afd->fd, len - n, 1);
if (n > len)
n = len;
memcpy(buf, b, n);
return n;
}
-static int awrite(int fd, void *buf, int len)
+static int awrite(struct align_fd *afd, void *buf, int len)
{
/* aligned write.
* On devices with a 4K sector size, we need to write
int bsize, iosize;
char *b;
int n;
- if (ioctl(fd, BLKSSZGET, &bsize) != 0)
- bsize = 512;
- if (bsize > 4096 || len > 4096)
+
+ bsize = afd->blk_sz;
+ if (!bsize || bsize > 4096 || len > 4096) {
+ if (!bsize)
+ fprintf(stderr, "WARNING - awrite() called with "
+ "invalid block size\n");
return -1;
- b = (char*)(((long)(abuf+4096))&~4095UL);
+ }
+ b = ROUND_UP_PTR((char *)abuf, 4096);
for (iosize = 0; iosize < len ; iosize += bsize)
;
if (len != iosize) {
- n = read(fd, b, iosize);
+ n = read(afd->fd, b, iosize);
if (n <= 0)
return n;
- lseek(fd, -n, 1);
+ lseek(afd->fd, -n, 1);
}
memcpy(b, buf, len);
- n = write(fd, b, iosize);
+ n = write(afd->fd, b, iosize);
if (n <= 0)
return n;
- lseek(fd, len - n, 1);
+ lseek(afd->fd, len - n, 1);
return len;
}
(unsigned long long)__le64_to_cpu(sb->data_size),
human_size(__le64_to_cpu(sb->data_size)<<9));
if (__le32_to_cpu(sb->level) > 0) {
- int ddsks=0;
+ int ddsks = 0, ddsks_denom = 1;
switch(__le32_to_cpu(sb->level)) {
case 1: ddsks=1;break;
case 4:
case 6: ddsks = __le32_to_cpu(sb->raid_disks)-2; break;
case 10:
layout = __le32_to_cpu(sb->layout);
- ddsks = __le32_to_cpu(sb->raid_disks)
- / (layout&255) / ((layout>>8)&255);
+ ddsks = __le32_to_cpu(sb->raid_disks);
+ ddsks_denom = (layout&255) * ((layout>>8)&255);
}
- if (ddsks)
+ if (ddsks) {
+ long long asize = __le64_to_cpu(sb->size);
+ asize = (asize << 9) * ddsks / ddsks_denom;
printf(" Array Size : %llu%s\n",
- ddsks*(unsigned long long)__le64_to_cpu(sb->size),
- human_size(ddsks*__le64_to_cpu(sb->size)<<9));
+ asize >> 10, human_size(asize));
+ }
if (sb->size != sb->data_size)
printf(" Used Dev Size : %llu%s\n",
(unsigned long long)__le64_to_cpu(sb->size),
char defname[10];
int sbsize;
- if (posix_memalign((void**)&sb, 512, SUPER1_SIZE) != 0) {
+ if (posix_memalign((void**)&sb, 4096, SUPER1_SIZE) != 0) {
fprintf(stderr, Name
": %s could not allocate superblock\n", __func__);
return 0;
}
- memset(sb, 0, MAX_SB_SIZE);
+ memset(sb, 0, SUPER1_SIZE);
st->sb = sb;
if (info == NULL) {
sprintf(defname, "%d", info->md_minor);
name = defname;
}
- memset(sb->set_name, 0, 32);
if (homehost &&
strchr(name, ':')== NULL &&
strlen(homehost)+1+strlen(name) < 32) {
{
struct mdp_superblock_1 *sb = st->sb;
unsigned long long sb_offset;
+ struct align_fd afd;
int sbsize;
unsigned long long dsize;
if (dsize < 24)
return 2;
+ init_afd(&afd, fd);
+
/*
* Calculate the position of the superblock.
* It is always aligned to a 4K boundary and
if (lseek64(fd, sb_offset << 9, 0)< 0LL)
return 3;
- sbsize = sizeof(*sb) + 2 * __le32_to_cpu(sb->max_dev);
- sbsize = (sbsize+511)&(~511UL);
+ sbsize = ROUND_UP(sizeof(*sb) + 2 * __le32_to_cpu(sb->max_dev), 512);
- if (awrite(fd, sb, sbsize) != sbsize)
+ if (awrite(&afd, sb, sbsize) != sbsize)
return 4;
if (sb->feature_map & __cpu_to_le32(MD_FEATURE_BITMAP_OFFSET)) {
(((char*)sb)+MAX_SB_SIZE);
if (__le32_to_cpu(bm->magic) == BITMAP_MAGIC) {
locate_bitmap1(st, fd);
- if (awrite(fd, bm, sizeof(*bm)) !=
- sizeof(*bm))
- return 5;
+ if (awrite(&afd, bm, sizeof(*bm)) != sizeof(*bm))
+ return 5;
}
}
fsync(fd);
return 1;
if (!first) {
- if (posix_memalign((void**)&first, 512, SUPER1_SIZE) != 0) {
+ if (posix_memalign((void**)&first, 4096, SUPER1_SIZE) != 0) {
fprintf(stderr, Name
": %s could not allocate superblock\n", __func__);
return 1;
int uuid[4];
struct bitmap_super_s *bsb;
struct misc_dev_info *misc;
+ struct align_fd afd;
free_super1(st);
+ init_afd(&afd, fd);
+
if (st->ss == NULL || st->minor_version == -1) {
int bestvers = -1;
struct supertype tst;
return 1;
}
- if (posix_memalign((void**)&super, 512, SUPER1_SIZE) != 0) {
+ if (posix_memalign((void**)&super, 4096, SUPER1_SIZE) != 0) {
fprintf(stderr, Name ": %s could not allocate superblock\n",
__func__);
return 1;
}
- if (aread(fd, super, MAX_SB_SIZE) != MAX_SB_SIZE) {
+ if (aread(&afd, super, MAX_SB_SIZE) != MAX_SB_SIZE) {
if (devname)
fprintf(stderr, Name ": Cannot read superblock on %s\n",
devname);
* should get that written out.
*/
locate_bitmap1(st, fd);
- if (aread(fd, bsb, 512) != 512)
+ if (aread(&afd, bsb, 512) != 512)
goto no_bitmap;
uuid_from_super1(st, uuid);
static struct supertype *match_metadata_desc1(char *arg)
{
- struct supertype *st = malloc(sizeof(*st));
- if (!st) return st;
+ struct supertype *st = calloc(1, sizeof(*st));
+ if (!st)
+ return st;
- memset(st, 0, sizeof(*st));
st->container_dev = NoMdDev;
st->ss = &super1;
st->max_devs = MAX_DEVS;
int rv = 0;
void *buf;
int towrite, n;
+ struct align_fd afd;
+
+ init_afd(&afd, fd);
locate_bitmap1(st, fd);
n = towrite;
if (n > 4096)
n = 4096;
- n = awrite(fd, buf, n);
+ n = awrite(&afd, buf, n);
if (n > 0)
towrite -= n;
else
projects / thirdparty / mdadm.git / blobdiff