diff options
| author | Alasdair Kergon <agk@redhat.com> | 2009-07-24 18:15:06 +0000 |
|---|---|---|
| committer | Alasdair Kergon <agk@redhat.com> | 2009-07-24 18:15:06 +0000 |
| commit | c07d773e67f9bd4fbd0cdb4386cd4cccbe53d624 (patch) | |
| tree | 99ca2ef4cfecbc9fd2c482128dad7059ffa53bc2 /daemons/clvmd/lvm-functions.c | |
| parent | fce6fb489fc7a2381f7650a551c007b4164a5b20 (diff) | |
| download | lvm2-c07d773e67f9bd4fbd0cdb4386cd4cccbe53d624.tar.gz lvm2-c07d773e67f9bd4fbd0cdb4386cd4cccbe53d624.tar.xz lvm2-c07d773e67f9bd4fbd0cdb4386cd4cccbe53d624.zip | |
All LV locks are non-blocking so remove LCK_NONBLOCK from separate macros.
Diffstat (limited to 'daemons/clvmd/lvm-functions.c')
| -rw-r--r-- | daemons/clvmd/lvm-functions.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/daemons/clvmd/lvm-functions.c b/daemons/clvmd/lvm-functions.c index a3e36f2a..eb9ad6fb 100644 --- a/daemons/clvmd/lvm-functions.c +++ b/daemons/clvmd/lvm-functions.c @@ -65,8 +65,6 @@ struct lv_info { int lock_mode; }; -#define LCK_MASK (LCK_TYPE_MASK | LCK_SCOPE_MASK) - static const char *decode_locking_cmd(unsigned char cmdl) { static char buf[128]; @@ -482,28 +480,28 @@ int do_lock_lv(unsigned char command, unsigned char lock_flags, char *resource) cmd->partial_activation = (lock_flags & LCK_PARTIAL_MODE) ? 1 : 0; switch (command) { - case LCK_LV_EXCLUSIVE: + case LCK_LV_EXCLUSIVE & LCK_MASK: status = do_activate_lv(resource, lock_flags, LKM_EXMODE); break; - case LCK_LV_SUSPEND: + case LCK_LV_SUSPEND & LCK_MASK: status = do_suspend_lv(resource); if (!status) suspended++; break; case LCK_UNLOCK: - case LCK_LV_RESUME: /* if active */ + case LCK_LV_RESUME & LCK_MASK: /* if active */ status = do_resume_lv(resource); if (!status) suspended--; break; - case LCK_LV_ACTIVATE: + case LCK_LV_ACTIVATE & LCK_MASK: status = do_activate_lv(resource, lock_flags, LKM_CRMODE); break; - case LCK_LV_DEACTIVATE: + case LCK_LV_DEACTIVATE & LCK_MASK: status = do_deactivate_lv(resource, lock_flags); break; |