mirror of
git://sourceware.org/git/lvm2.git
synced 2025-10-23 23:33:15 +03:00
Create _init_globals() and call from bottom of create_toolcontext().
Move init_full_scan_done(0) and init_mirror_in_sync(0) from init_lvm() after call to create_toolcontext() to _init_globals(), called from bottom of create_toolcontext(). No functional change. Author: Dave Wysochanski <dwysocha@redhat.com> Acked-by: James Cameron <james.cameron@hp.com> Acked-by: Alasdair G Kergon <agk@redhat.com>
This commit is contained in:
@@ -990,6 +990,13 @@ static void _init_rand(struct cmd_context *cmd)
|
|||||||
cmd->rand_seed = (unsigned) time(NULL) + (unsigned) getpid();
|
cmd->rand_seed = (unsigned) time(NULL) + (unsigned) getpid();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void _init_globals(struct cmd_context *cmd)
|
||||||
|
{
|
||||||
|
init_full_scan_done(0);
|
||||||
|
init_mirror_in_sync(0);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
/* Entry point */
|
/* Entry point */
|
||||||
struct cmd_context *create_toolcontext(struct arg *the_args, unsigned is_static,
|
struct cmd_context *create_toolcontext(struct arg *the_args, unsigned is_static,
|
||||||
unsigned is_long_lived)
|
unsigned is_long_lived)
|
||||||
@@ -1090,6 +1097,8 @@ struct cmd_context *create_toolcontext(struct arg *the_args, unsigned is_static,
|
|||||||
|
|
||||||
_init_rand(cmd);
|
_init_rand(cmd);
|
||||||
|
|
||||||
|
_init_globals(cmd);
|
||||||
|
|
||||||
cmd->default_settings.cache_vgmetadata = 1;
|
cmd->default_settings.cache_vgmetadata = 1;
|
||||||
cmd->current_settings = cmd->default_settings;
|
cmd->current_settings = cmd->default_settings;
|
||||||
|
|
||||||
|
|||||||
@@ -1091,9 +1091,6 @@ struct cmd_context *init_lvm(unsigned is_static)
|
|||||||
if (!(cmd = create_toolcontext(_cmdline.the_args, is_static, 0)))
|
if (!(cmd = create_toolcontext(_cmdline.the_args, is_static, 0)))
|
||||||
return_NULL;
|
return_NULL;
|
||||||
|
|
||||||
init_full_scan_done(0);
|
|
||||||
init_mirror_in_sync(0);
|
|
||||||
|
|
||||||
return cmd;
|
return cmd;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user