diff options
| author | Michael Tokarev <mjt@tls.msk.ru> | 2014-09-20 08:50:44 +0400 |
|---|---|---|
| committer | Michael Tokarev <mjt@tls.msk.ru> | 2014-09-20 08:50:44 +0400 |
| commit | 20d0ba040d767361c1d0c8a825b2a5e8bfdb39a6 (patch) | |
| tree | 687a5eda9314ea76da64e234ba269d84345f7efe /managemon.c | |
| parent | fef4f4267e21104887eba03b8ddec5e6a3fc9747 (diff) | |
| parent | fed12d436b9803ad97d1f11cc8f312ab08c3a659 (diff) | |
Merge tag 'mdadm-3.3.2' into debian
Release mdadm-3.3.2
Minor bugfix/stability release.
Diffstat (limited to 'managemon.c')
| -rw-r--r-- | managemon.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/managemon.c b/managemon.c index fc8d1fe7..1c9eccc4 100644 --- a/managemon.c +++ b/managemon.c @@ -697,7 +697,7 @@ static void manage_new(struct mdstat_ent *mdstat, new->resync_start_fd = sysfs_open(new->info.sys_name, NULL, "resync_start"); new->metadata_fd = sysfs_open(new->info.sys_name, NULL, "metadata_version"); new->sync_completed_fd = sysfs_open(new->info.sys_name, NULL, "sync_completed"); - dprintf("%s: inst: %d action: %d state: %d\n", __func__, atoi(inst), + dprintf("%s: inst: %s action: %d state: %d\n", __func__, inst, new->action_fd, new->info.state_fd); if (sigterm) @@ -819,7 +819,8 @@ static void handle_message(struct supertype *container, struct metadata_update * mu->space_list = NULL; mu->next = NULL; if (container->ss->prepare_update) - container->ss->prepare_update(container, mu); + if (!container->ss->prepare_update(container, mu)) + free_updates(&mu); queue_metadata_update(mu); } } |