diff options
| author | Dave Wysochanski <dwysocha@redhat.com> | 2009-07-08 14:33:17 +0000 |
|---|---|---|
| committer | Dave Wysochanski <dwysocha@redhat.com> | 2009-07-08 14:33:17 +0000 |
| commit | 4c35d6dee69e05f222b76ee2674bebb27410be86 (patch) | |
| tree | f131692df1ad9227e4dae7bf3141b9e1cc4b91fe /tools | |
| parent | b251e090350f7f32041832e5cd0da4eb895a3cea (diff) | |
| download | lvm2-4c35d6dee69e05f222b76ee2674bebb27410be86.tar.gz lvm2-4c35d6dee69e05f222b76ee2674bebb27410be86.tar.xz lvm2-4c35d6dee69e05f222b76ee2674bebb27410be86.zip | |
Remove unneeded LOCK_NONBLOCKING from vg_read() API.
Remove unneeded LOCK_NONBLOCKING from vg_read() API and tools that
use it. We no longer need this flag anywhere since we now automatically
set LCK_NONBLOCK inside lock_vol() if vgs_locked().
For further details, see:
commit d52b3fd3fe2006e2d13e42f8518b6512bff03710
Author: Dave Wysochanski <dwysocha@redhat.com>
Date: Wed May 13 13:02:52 2009 +0000
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.
At some point it may make sense to add this flag back if we get an
RFE from a liblvm user, but for now let's keep it as simple as
possible.
Signed-off-by: Dave Wysochanski <dwysocha@redhat.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/vgextend.c | 2 | ||||
| -rw-r--r-- | tools/vgmerge.c | 3 | ||||
| -rw-r--r-- | tools/vgreduce.c | 2 | ||||
| -rw-r--r-- | tools/vgremove.c | 2 | ||||
| -rw-r--r-- | tools/vgsplit.c | 3 |
5 files changed, 5 insertions, 7 deletions
diff --git a/tools/vgextend.c b/tools/vgextend.c index 1000dc2c..a08d4dbd 100644 --- a/tools/vgextend.c +++ b/tools/vgextend.c @@ -43,7 +43,7 @@ int vgextend(struct cmd_context *cmd, int argc, char **argv) log_verbose("Checking for volume group \"%s\"", vg_name); vg = vg_read_for_update(cmd, vg_name, NULL, - READ_REQUIRE_RESIZEABLE | LOCK_NONBLOCKING); + READ_REQUIRE_RESIZEABLE); if (vg_read_error(vg)) { vg_release(vg); unlock_vg(cmd, VG_ORPHANS); diff --git a/tools/vgmerge.c b/tools/vgmerge.c index 4a9e3772..37f6bd74 100644 --- a/tools/vgmerge.c +++ b/tools/vgmerge.c @@ -35,8 +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); - vg_from = vg_read_for_update(cmd, vg_name_from, NULL, - LOCK_NONBLOCKING); + vg_from = vg_read_for_update(cmd, vg_name_from, NULL, 0); if (vg_read_error(vg_from)) { vg_release(vg_from); unlock_and_release_vg(cmd, vg_to, vg_name_to); diff --git a/tools/vgreduce.c b/tools/vgreduce.c index 44010e3d..b3b6dba4 100644 --- a/tools/vgreduce.c +++ b/tools/vgreduce.c @@ -424,7 +424,7 @@ static int _vgreduce_single(struct cmd_context *cmd, struct volume_group *vg, vg->extent_count -= pv_pe_count(pv); orphan_vg = vg_read_for_update(cmd, vg->fid->fmt->orphan_vg_name, - NULL, LOCK_NONBLOCKING); + NULL, 0); if (vg_read_error(orphan_vg)) goto bad; diff --git a/tools/vgremove.c b/tools/vgremove.c index 5956075e..ff357209 100644 --- a/tools/vgremove.c +++ b/tools/vgremove.c @@ -41,7 +41,7 @@ int vgremove(struct cmd_context *cmd, int argc, char **argv) } ret = process_each_vg(cmd, argc, argv, - READ_FOR_UPDATE | LOCK_NONBLOCKING, + READ_FOR_UPDATE, NULL, &vgremove_single); unlock_vg(cmd, VG_ORPHANS); diff --git a/tools/vgsplit.c b/tools/vgsplit.c index c1a1b06c..d4daf535 100644 --- a/tools/vgsplit.c +++ b/tools/vgsplit.c @@ -341,8 +341,7 @@ int vgsplit(struct cmd_context *cmd, int argc, char **argv) if (rc == FAILED_EXIST) { existing_vg = 1; vg_to = vg_read_for_update(cmd, vg_name_to, NULL, - READ_REQUIRE_RESIZEABLE | - LOCK_NONBLOCKING); + READ_REQUIRE_RESIZEABLE); if (vg_read_error(vg_to)) { vg_release(vg_to); |