diff options
| author | Mike Snitzer <snitzer@redhat.com> | 2010-01-08 21:53:07 +0000 |
|---|---|---|
| committer | Mike Snitzer <snitzer@redhat.com> | 2010-01-08 21:53:07 +0000 |
| commit | c9f27b1ca177b6fcbeb28c16f9476b935680edac (patch) | |
| tree | 0a7ff792bd3d10ce2e10f5a250ac5e7583ef325e /tools/polldaemon.c | |
| parent | 5f6519758f6a5fe7aa320652386528b4dbbe218c (diff) | |
| download | lvm2-c9f27b1ca177b6fcbeb28c16f9476b935680edac.tar.gz lvm2-c9f27b1ca177b6fcbeb28c16f9476b935680edac.tar.xz lvm2-c9f27b1ca177b6fcbeb28c16f9476b935680edac.zip | |
Change background polldaemon's process name to "(lvm2)".
Made .update_metadata optional in 'struct poll_functions' definitions;
eliminated _update_lvconvert_mirror() stub.
Tweak a mirror-specific error message in the generic polldaemon code.
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Diffstat (limited to 'tools/polldaemon.c')
| -rw-r--r-- | tools/polldaemon.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/polldaemon.c b/tools/polldaemon.c index 577850d8..b4d6ebba 100644 --- a/tools/polldaemon.c +++ b/tools/polldaemon.c @@ -54,7 +54,7 @@ static int _become_daemon(struct cmd_context *cmd) close(STDOUT_FILENO); close(STDERR_FILENO); - strncpy(*cmd->argv, "(lvm2copyd)", strlen(*cmd->argv)); + strncpy(*cmd->argv, "(lvm2)", strlen(*cmd->argv)); reset_locking(); lvmcache_init(); @@ -137,8 +137,8 @@ static int _check_lv_status(struct cmd_context *cmd, if (!parms->poll_fns->finish_copy(cmd, vg, lv, lvs_changed)) return 0; } else { - if (!parms->poll_fns->update_metadata(cmd, vg, lv, lvs_changed, - 0)) { + if (parms->poll_fns->update_metadata && + !parms->poll_fns->update_metadata(cmd, vg, lv, lvs_changed, 0)) { log_error("ABORTING: Segment progression failed."); parms->poll_fns->finish_copy(cmd, vg, lv, lvs_changed); return 0; @@ -177,7 +177,7 @@ static int _wait_for_single_lv(struct cmd_context *cmd, const char *name, const if (!(lv = parms->poll_fns->get_copy_lv(cmd, vg, name, uuid, parms->lv_type))) { - log_error("ABORTING: Can't find mirror LV in %s for %s", + log_error("ABORTING: Can't find LV in %s for %s", vg->name, name); unlock_and_release_vg(cmd, vg, vg->name); return 0; |