diff options
Diffstat (limited to 'drivers/md/dm-raid1.c')
-rw-r--r-- | drivers/md/dm-raid1.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c index c8b4c108da9e..cb3f318a3692 100644 --- a/drivers/md/dm-raid1.c +++ b/drivers/md/dm-raid1.c | |||
@@ -1205,11 +1205,9 @@ static void mirror_resume(struct dm_target *ti) | |||
1205 | static int mirror_status(struct dm_target *ti, status_type_t type, | 1205 | static int mirror_status(struct dm_target *ti, status_type_t type, |
1206 | char *result, unsigned int maxlen) | 1206 | char *result, unsigned int maxlen) |
1207 | { | 1207 | { |
1208 | unsigned int m, sz; | 1208 | unsigned int m, sz = 0; |
1209 | struct mirror_set *ms = (struct mirror_set *) ti->private; | 1209 | struct mirror_set *ms = (struct mirror_set *) ti->private; |
1210 | 1210 | ||
1211 | sz = ms->rh.log->type->status(ms->rh.log, type, result, maxlen); | ||
1212 | |||
1213 | switch (type) { | 1211 | switch (type) { |
1214 | case STATUSTYPE_INFO: | 1212 | case STATUSTYPE_INFO: |
1215 | DMEMIT("%d ", ms->nr_mirrors); | 1213 | DMEMIT("%d ", ms->nr_mirrors); |
@@ -1220,9 +1218,14 @@ static int mirror_status(struct dm_target *ti, status_type_t type, | |||
1220 | (unsigned long long)ms->rh.log->type-> | 1218 | (unsigned long long)ms->rh.log->type-> |
1221 | get_sync_count(ms->rh.log), | 1219 | get_sync_count(ms->rh.log), |
1222 | (unsigned long long)ms->nr_regions); | 1220 | (unsigned long long)ms->nr_regions); |
1221 | |||
1222 | sz = ms->rh.log->type->status(ms->rh.log, type, result, maxlen); | ||
1223 | |||
1223 | break; | 1224 | break; |
1224 | 1225 | ||
1225 | case STATUSTYPE_TABLE: | 1226 | case STATUSTYPE_TABLE: |
1227 | sz = ms->rh.log->type->status(ms->rh.log, type, result, maxlen); | ||
1228 | |||
1226 | DMEMIT("%d", ms->nr_mirrors); | 1229 | DMEMIT("%d", ms->nr_mirrors); |
1227 | for (m = 0; m < ms->nr_mirrors; m++) | 1230 | for (m = 0; m < ms->nr_mirrors; m++) |
1228 | DMEMIT(" %s %llu", ms->mirror[m].dev->name, | 1231 | DMEMIT(" %s %llu", ms->mirror[m].dev->name, |
@@ -1234,7 +1237,7 @@ static int mirror_status(struct dm_target *ti, status_type_t type, | |||
1234 | 1237 | ||
1235 | static struct target_type mirror_target = { | 1238 | static struct target_type mirror_target = { |
1236 | .name = "mirror", | 1239 | .name = "mirror", |
1237 | .version = {1, 0, 2}, | 1240 | .version = {1, 0, 3}, |
1238 | .module = THIS_MODULE, | 1241 | .module = THIS_MODULE, |
1239 | .ctr = mirror_ctr, | 1242 | .ctr = mirror_ctr, |
1240 | .dtr = mirror_dtr, | 1243 | .dtr = mirror_dtr, |