diff options
author | Guoqing Jiang <gqjiang@suse.com> | 2015-06-10 13:42:13 +0800 |
---|---|---|
committer | NeilBrown <neilb@suse.de> | 2015-06-17 09:44:38 +1000 |
commit | 4a3d29edce15b739803194b5fd5b41c2f3fea939 (patch) | |
tree | 0204e6dfc9b5302076487529ec6b3b9109a68cd8 | |
parent | 7e6e839a265190e15742c4ecdd050aa1d9f208c6 (diff) | |
download | mdadm-cluster.tar.gz |
Reuse calc_bitmap_size to reduce code sizecluster
We can use the new added calc_bitmap_size func to remove some
redundant lines.
Signed-off-by: Guoqing Jiang <gqjiang@suse.com>
Signed-off-by: NeilBrown <neilb@suse.de>
-rw-r--r-- | super1.c | 12 |
1 files changed, 2 insertions, 10 deletions
@@ -698,12 +698,8 @@ static int copy_metadata1(struct supertype *st, int from, int to) /* have the header, can calculate * correct bitmap bytes */ bitmap_super_t *bms; - int bits; bms = (void*)buf; - bits = __le64_to_cpu(bms->sync_size) / (__le32_to_cpu(bms->chunksize)>>9); - bytes = (bits+7) >> 3; - bytes += sizeof(bitmap_super_t); - bytes = ROUND_UP(bytes, 512); + bytes = calc_bitmap_size(bms, 512); if (n > bytes) n = bytes; } @@ -2258,11 +2254,7 @@ static int write_bitmap1(struct supertype *st, int fd, enum bitmap_update update memset(buf, 0xff, 4096); memcpy(buf, (char *)bms, sizeof(bitmap_super_t)); - towrite = __le64_to_cpu(bms->sync_size) / (__le32_to_cpu(bms->chunksize)>>9); - towrite = (towrite+7) >> 3; /* bits to bytes */ - towrite += sizeof(bitmap_super_t); - /* we need the bitmaps to be at 4k boundary */ - towrite = ROUND_UP(towrite, 4096); + towrite = calc_bitmap_size(bms, 4096); while (towrite > 0) { n = towrite; if (n > 4096) |