diff options
| author | Dave Wysochanski <dwysocha@redhat.com> | 2009-07-10 20:10:18 +0000 |
|---|---|---|
| committer | Dave Wysochanski <dwysocha@redhat.com> | 2009-07-10 20:10:18 +0000 |
| commit | b85357cd0c165419654f6b82d4504aac559b2dc4 (patch) | |
| tree | 86ff346b82f6d09dcf38243077b17b7996688a1e /tools/vgcfgrestore.c | |
| parent | 7fa91ec044b977785598ef57d8c53af59b2e3782 (diff) | |
| download | lvm2-b85357cd0c165419654f6b82d4504aac559b2dc4.tar.gz lvm2-b85357cd0c165419654f6b82d4504aac559b2dc4.tar.xz lvm2-b85357cd0c165419654f6b82d4504aac559b2dc4.zip | |
Change lock ordering of vgcfgrestore to be consistent with other tools.
Orphan lock is now obtained second and released first, and all tools
are consistent in this regard.
Signed-off-by: Dave Wysochanski <dwysocha@redhat.com>
Diffstat (limited to 'tools/vgcfgrestore.c')
| -rw-r--r-- | tools/vgcfgrestore.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/vgcfgrestore.c b/tools/vgcfgrestore.c index 6ec20d16..e1d6bb4a 100644 --- a/tools/vgcfgrestore.c +++ b/tools/vgcfgrestore.c @@ -43,17 +43,17 @@ int vgcfgrestore(struct cmd_context *cmd, int argc, char **argv) return ECMD_PROCESSED; } - if (!lock_vol(cmd, VG_ORPHANS, LCK_VG_WRITE)) { - log_error("Unable to lock orphans"); - return ECMD_FAILED; - } - if (!lock_vol(cmd, vg_name, LCK_VG_WRITE)) { log_error("Unable to lock volume group %s", vg_name); unlock_vg(cmd, VG_ORPHANS); return ECMD_FAILED; } + if (!lock_vol(cmd, VG_ORPHANS, LCK_VG_WRITE)) { + log_error("Unable to lock orphans"); + return ECMD_FAILED; + } + if (!(arg_count(cmd, file_ARG) ? backup_restore_from_file(cmd, vg_name, arg_str_value(cmd, file_ARG, "")) : @@ -66,7 +66,7 @@ int vgcfgrestore(struct cmd_context *cmd, int argc, char **argv) log_print("Restored volume group %s", vg_name); - unlock_vg(cmd, vg_name); unlock_vg(cmd, VG_ORPHANS); + unlock_vg(cmd, vg_name); return ECMD_PROCESSED; } |