From: NeilBrown Date: Mon, 27 Jul 2015 01:01:08 +0000 (+1000) Subject: Merge branch 'cluster' X-Git-Tag: mdadm-3.4~67 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=653299b6991b0a3a5a136d4f547e7675980c9095;p=thirdparty%2Fmdadm.git Merge branch 'cluster' Now that 3.3.3 is out, it is time to include the cluster-support code. Signed-off-by: NeilBrown --- 653299b6991b0a3a5a136d4f547e7675980c9095 diff --cc bitmap.c index bbe9baec,0c3f6dea..60865bcc --- a/bitmap.c +++ b/bitmap.c @@@ -32,9 -32,11 +32,11 @@@ static inline void sb_le_to_cpu(bitmap_ sb->daemon_sleep = __le32_to_cpu(sb->daemon_sleep); sb->sync_size = __le64_to_cpu(sb->sync_size); sb->write_behind = __le32_to_cpu(sb->write_behind); + sb->nodes = __le32_to_cpu(sb->nodes); + sb->sectors_reserved = __le32_to_cpu(sb->sectors_reserved); } -inline void sb_cpu_to_le(bitmap_super_t *sb) +static inline void sb_cpu_to_le(bitmap_super_t *sb) { sb_le_to_cpu(sb); /* these are really the same thing */ }