shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

Insert some missing stack macros into activation code.

Browse Source
This commit is contained in:
Alasdair Kergon 2009-10-30 13:07:49 +00:00
parent 4059d2219c
commit 75b37a1147
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW
View File

@ -1,5 +1,6 @@
Version 2.02.55 -
===================================
Insert some missing stack macros into activation code.
Recognise DRBD device part and handle it similar to MD devices.
Version 2.02.54 - 26th October 2009

19
lib/activate/activate.c
View File

@ -936,7 +936,7 @@ static int _lv_resume(struct cmd_context *cmd, const char *lvid_s,
return 1;
if (!(lv = lv_from_lvid(cmd, lvid_s, 0)))
goto out;
goto_out;
if (test_mode()) {
_skip("Resuming '%s'.", lv->name);
@ -949,11 +949,11 @@ static int _lv_resume(struct cmd_context *cmd, const char *lvid_s,
if (!info.exists || !info.suspended) {
r = error_if_not_active ? 0 : 1;
goto out;
goto_out;
}
if (!_lv_activate_lv(lv))
goto out;
goto_out;
memlock_dec();
fs_unlock();
@ -1138,7 +1138,8 @@ static int _lv_activate(struct cmd_context *cmd, const char *lvid_s,
lv->status |= ACTIVATE_EXCL;
memlock_inc();
r = _lv_activate_lv(lv);
if (!(r = _lv_activate_lv(lv)))
stack;
memlock_dec();
fs_unlock();
@ -1155,13 +1156,19 @@ out:
/* Activate LV */
int lv_activate(struct cmd_context *cmd, const char *lvid_s, int exclusive)
{
return _lv_activate(cmd, lvid_s, exclusive, 0);
if (!_lv_activate(cmd, lvid_s, exclusive, 0))
return_0;
return 1;
}
/* Activate LV only if it passes filter */
int lv_activate_with_filter(struct cmd_context *cmd, const char *lvid_s, int exclusive)
{
return _lv_activate(cmd, lvid_s, exclusive, 1);
if (!_lv_activate(cmd, lvid_s, exclusive, 1))
return_0;
return 1;
}
int lv_mknodes(struct cmd_context *cmd, const struct logical_volume *lv)