shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-02-24 17:57:48 +03:00
Code Releases Activity

Reverting recent commit to disallow adding/removing mirror log while

Browse Source 
removing/adding mirror images... There was already code in there to
do the job - I just didn't find it in WHATS_NEW (or in the code right
away).
This commit is contained in:
Jonathan Earl Brassow 2011-01-05 23:18:46 +00:00
parent 327dbf1078
commit 7871d2c8e7
2 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW
View File

@ -1,6 +1,5 @@
Version 2.02.80 -
====================================
Prevent adding/removing mirror log while removing/adding an image.
Add missing tests in _setup_task().
Fail poll daemon creation when lvmcache_init() fails.
Return defined value for errors in _copy_percent() and _snap_percent().

23
tools/lvconvert.c
View File

@ -926,25 +926,6 @@ static int _lvconvert_mirrors_parse_params(struct cmd_context *cmd,
return 0;
}
/*
* Disallow adding logs while removing images or
* adding images while removing logs
*/
if ((*old_log_count < *new_log_count) &&
(*old_mimage_count > *new_mimage_count)) {
log_error("Mirror logs cannot be added while images are"
" being removed.");
log_error("Try two separate commands.");
return 0;
}
if ((*old_log_count > *new_log_count) &&
(*old_mimage_count < *new_mimage_count)) {
log_error("Mirror images cannot be added while logs are"
" being removed.");
log_error("Try two separate commands.");
return 0;
}
/*
* No mirrored logs for cluster mirrors until
* log daemon is multi-threaded.
@ -1368,8 +1349,8 @@ static int _lvconvert_mirrors(struct cmd_context *cmd,
if (((old_mimage_count < new_mimage_count && old_log_count > new_log_count) ||
(old_mimage_count > new_mimage_count && old_log_count < new_log_count)) &&
lp->pv_count) {
log_error("Cannot both allocate and free extents when specifying physical"
" volumes to use.");
log_error("Cannot both allocate and free extents when "
"specifying physical volumes to use.");
log_error("Please specify the operation in two steps.");
return 0;
}