diff options
| author | Dave Wysochanski <dwysocha@redhat.com> | 2009-05-13 13:02:52 +0000 |
|---|---|---|
| committer | Dave Wysochanski <dwysocha@redhat.com> | 2009-05-13 13:02:52 +0000 |
| commit | 5a820745ce09adb0388a44e972ca909810fa03e8 (patch) | |
| tree | 7e75de983fd790f476948adf7a4cd55e60d67c32 /tools/vgmerge.c | |
| parent | b44e3bdc86e8891be7bf651cc8dd7840c7d78ca5 (diff) | |
| download | lvm2-5a820745ce09adb0388a44e972ca909810fa03e8.tar.gz | |
Remove NON_BLOCKING lock flag from tools and set a policy to auto-set.
As a simplification to the tools and further liblvm, this patch pushes
the setting of NON_BLOCKING lock flag inside the lock_vol() call.
The policy we set is if any existing VGs are currently locked, we
set the NON_BLOCKING flag.
Should be no functional change.
Diffstat (limited to 'tools/vgmerge.c')
| -rw-r--r-- | tools/vgmerge.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/vgmerge.c b/tools/vgmerge.c index 82c34561d..8b85c7af3 100644 --- a/tools/vgmerge.c +++ b/tools/vgmerge.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. - * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. + * Copyright (C) 2004-2009 Red Hat, Inc. All rights reserved. * * This file is part of LVM2. * @@ -35,7 +35,7 @@ static int _vgmerge_single(struct cmd_context *cmd, const char *vg_name_to, log_verbose("Checking for volume group \"%s\"", vg_name_from); if (!(vg_from = vg_lock_and_read(cmd, vg_name_from, NULL, - LCK_VG_WRITE | LCK_NONBLOCK, + LCK_VG_WRITE, CLUSTERED | EXPORTED_VG | LVM_WRITE, CORRECT_INCONSISTENT | FAIL_INCONSISTENT))) { unlock_release_vg(cmd, vg_to, vg_name_to); |