From: mwilck@arcor.de <mwilck@arcor.de>
Date: Wed, 3 Jul 2013 20:28:02 +0000 (+0200)
Subject: DDF: getinfo_super_ddf_bvd: lba_offset calculation for RAID10
X-Git-Tag: mdadm-3.3-rc2~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ddf94a437e9f7f64fedbfd3a617bc7494c069037;p=thirdparty%2Fmdadm.git

DDF: getinfo_super_ddf_bvd: lba_offset calculation for RAID10

Secondary RAID needs some extra logic here, too.

Signed-off-by: Martin Wilck <mwilck@arcor.de>
Signed-off-by: NeilBrown <neilb@suse.de>
---

diff --git a/super-ddf.c b/super-ddf.c
index 1abd9e5c..0a04519d 100644
--- a/super-ddf.c
+++ b/super-ddf.c
@@ -1832,10 +1832,12 @@ static void getinfo_super_ddf_bvd(struct supertype *st, struct mdinfo *info, cha
 	struct ddf_super *ddf = st->sb;
 	struct vcl *vc = ddf->currentconf;
 	int cd = ddf->currentdev;
+	int n_prim;
 	int j;
 	struct dl *dl;
 	int map_disks = info->array.raid_disks;
 	__u32 *cptr;
+	struct vd_config *conf;
 
 	memset(info, 0, sizeof(*info));
 	if (layout_ddf2md(&vc->conf, &info->array) == -1)
@@ -1847,6 +1849,14 @@ static void getinfo_super_ddf_bvd(struct supertype *st, struct mdinfo *info, cha
 	info->array.chunk_size	  = 512 << vc->conf.chunk_shift;
 	info->custom_array_size	  = 0;
 
+	conf = &vc->conf;
+	n_prim = __be16_to_cpu(conf->prim_elmnt_count);
+	if (conf->sec_elmnt_count > 1 && cd >= n_prim) {
+		int ibvd = cd / n_prim - 1;
+		cd %= n_prim;
+		conf = vc->other_bvds[ibvd];
+	}
+
 	if (cd >= 0 && (unsigned)cd < ddf->mppe) {
 		info->data_offset =
 			__be64_to_cpu(LBA_OFFSET(ddf, &vc->conf)[cd]);