diff options
| author | Zdenek Kabelac <zkabelac@redhat.com> | 2014-11-18 09:04:30 +0100 |
|---|---|---|
| committer | Zdenek Kabelac <zkabelac@redhat.com> | 2014-11-18 16:50:49 +0100 |
| commit | 01760967b45a68f1645b797e69b28403a7823ee2 (patch) | |
| tree | 2fe3723e54702abf5580a7574865953dcd40aa99 /daemons/clvmd | |
| parent | aaa6205d5ad4beb8a54d56f9285cafb5dbd5c7b4 (diff) | |
| download | lvm2-01760967b45a68f1645b797e69b28403a7823ee2.tar.gz | |
locking: rename LCK_CONVERT
All 'MODE' bits are using _MODE suffix so rename to LCK_CONVERT_MODE
(part of rhbz 735445).
No functional change.
Diffstat (limited to 'daemons/clvmd')
| -rw-r--r-- | daemons/clvmd/lvm-functions.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/daemons/clvmd/lvm-functions.c b/daemons/clvmd/lvm-functions.c index 4ebd059d5..dafffcc40 100644 --- a/daemons/clvmd/lvm-functions.c +++ b/daemons/clvmd/lvm-functions.c @@ -136,7 +136,7 @@ static const char *decode_flags(unsigned char flags) flags & LCK_DMEVENTD_MONITOR_MODE ? "DMEVENTD_MONITOR|" : "", flags & LCK_ORIGIN_ONLY_MODE ? "ORIGIN_ONLY|" : "", flags & LCK_TEST_MODE ? "TEST|" : "", - flags & LCK_CONVERT ? "CONVERT|" : "", + flags & LCK_CONVERT_MODE ? "CONVERT|" : "", flags & LCK_DMEVENTD_MONITOR_IGNORE ? "DMEVENTD_MONITOR_IGNORE|" : "", flags & LCK_REVERT_MODE ? "REVERT|" : ""); @@ -375,7 +375,7 @@ static int do_activate_lv(char *resource, unsigned char command, unsigned char l * of exclusive lock to shared one during activation. */ if (!test_mode() && command & LCK_CLUSTER_VG) { - status = hold_lock(resource, mode, LCKF_NOQUEUE | (lock_flags & LCK_CONVERT ? LCKF_CONVERT:0)); + status = hold_lock(resource, mode, LCKF_NOQUEUE | ((lock_flags & LCK_CONVERT_MODE) ? LCKF_CONVERT:0)); if (status) { /* Return an LVM-sensible error for this. * Forcing EIO makes the upper level return this text |