diff options
| author | David Teigland <teigland@redhat.com> | 2014-10-16 15:09:23 -0500 |
|---|---|---|
| committer | David Teigland <teigland@redhat.com> | 2014-10-17 14:03:13 -0500 |
| commit | b4b540724b07a16c7f69fd22a332d1c85c216b74 (patch) | |
| tree | c34a651732812fd75683d06a46d5fa762b2cf8af | |
| parent | 52295710e77d0028950a05c7dfd0fdab74ef5508 (diff) | |
| download | lvm2-dev-dct-pvchange.tar.gz | |
vg_read: remove unused READ_WITHOUT_LOCKdev-dct-pvchange
| -rw-r--r-- | lib/metadata/metadata-exported.h | 1 | ||||
| -rw-r--r-- | lib/metadata/metadata.c | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/lib/metadata/metadata-exported.h b/lib/metadata/metadata-exported.h index bf6f1c122..cbb9eaaf0 100644 --- a/lib/metadata/metadata-exported.h +++ b/lib/metadata/metadata-exported.h @@ -145,7 +145,6 @@ /* vg_read and vg_read_for_update flags */ #define READ_ALLOW_INCONSISTENT 0x00010000U #define READ_ALLOW_EXPORTED 0x00020000U -#define READ_WITHOUT_LOCK 0x00040000U #define READ_WARN_INCONSISTENT 0x00080000U /* A meta-flag, useful with toollib for_each_* functions. */ diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c index 9308cb739..3e1b94ac3 100644 --- a/lib/metadata/metadata.c +++ b/lib/metadata/metadata.c @@ -4256,7 +4256,7 @@ static struct volume_group *_vg_lock_and_read(struct cmd_context *cmd, const cha already_locked = lvmcache_vgname_is_locked(vg_name); - if (!already_locked && !(misc_flags & READ_WITHOUT_LOCK) && + if (!already_locked && !lock_vol(cmd, vg_name, lock_flags, NULL)) { log_error("Can't get lock for %s", vg_name); return _vg_make_handle(cmd, vg, FAILED_LOCKING); @@ -4330,7 +4330,7 @@ static struct volume_group *_vg_lock_and_read(struct cmd_context *cmd, const cha return _vg_make_handle(cmd, vg, failure); bad: - if (!already_locked && !(misc_flags & READ_WITHOUT_LOCK)) + if (!already_locked) unlock_vg(cmd, vg_name); bad_no_unlock: |