diff options
| author | David Teigland <teigland@redhat.com> | 2015-07-02 13:30:51 -0500 |
|---|---|---|
| committer | David Teigland <teigland@redhat.com> | 2015-07-02 13:30:51 -0500 |
| commit | 41cd7d12ffb3321b6831320ada258554e56e33b0 (patch) | |
| tree | 24f414d4833bbf5c1e9fec9663d8be8e6833b9ec | |
| parent | 5561494e571f6e7b41bd77d3d1cce6bafedacd97 (diff) | |
| download | lvm2-dev-dct-lvmlockd-AX.tar.gz | |
Remove --lock-{gl,vg,lv} optionsdev-dct-lvmlockd-AX
| -rw-r--r-- | tools/args.h | 3 | ||||
| -rw-r--r-- | tools/lvmcmdline.c | 7 |
2 files changed, 0 insertions, 10 deletions
diff --git a/tools/args.h b/tools/args.h index 80c2a24d3..c88777438 100644 --- a/tools/args.h +++ b/tools/args.h @@ -50,9 +50,6 @@ arg(ignoremonitoring_ARG, '\0', "ignoremonitoring", NULL, 0) arg(ignoreskippedcluster_ARG, '\0', "ignoreskippedcluster", NULL, 0) arg(ignoreunsupported_ARG, '\0', "ignoreunsupported", NULL, 0) arg(labelsector_ARG, '\0', "labelsector", int_arg, 0) -arg(lockgl_ARG, '\0', "lockgl", string_arg, 0) -arg(lockvg_ARG, '\0', "lockvg", string_arg, 0) -arg(locklv_ARG, '\0', "locklv", string_arg, 0) arg(lockopt_ARG, '\0', "lockopt", string_arg, 0) arg(lockstart_ARG, '\0', "lockstart", NULL, 0) arg(lockstop_ARG, '\0', "lockstop", NULL, 0) diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c index f280954fc..7808c12c3 100644 --- a/tools/lvmcmdline.c +++ b/tools/lvmcmdline.c @@ -771,7 +771,6 @@ void lvm_register_commands(void) yes_ARG, \ quiet_ARG, config_ARG, \ commandprofile_ARG, \ - lockgl_ARG, lockvg_ARG, locklv_ARG, \ profile_ARG, -1); #include "commands.h" #undef xx @@ -1060,14 +1059,8 @@ static int _get_settings(struct cmd_context *cmd) cmd->current_settings.backup = 0; } - if (arg_is_set(cmd, lockgl_ARG)) - cmd->lock_gl_mode = arg_str_value(cmd, lockgl_ARG, NULL); - if (arg_is_set(cmd, lockvg_ARG)) - cmd->lock_vg_mode = arg_str_value(cmd, lockvg_ARG, NULL); if (cmd->command->flags & LOCKD_VG_SH) cmd->lockd_vg_default_sh = 1; - if (arg_is_set(cmd, locklv_ARG)) - cmd->lock_lv_mode = arg_str_value(cmd, locklv_ARG, NULL); cmd->partial_activation = 0; cmd->degraded_activation = 0; |