shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-03 05:18:29 +03:00
Code Releases Activity

lv_remove_single: add silent arg

Browse Source 
Support silence for removal message.
This commit is contained in:
Zdenek Kabelac 2013-11-29 17:00:55 +01:00
parent 84b3852ee5
commit 5a6794a2ce
5 changed files with 7 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.105 - Version 2.02.105 -
===================================== =====================================
Extend lv_remove_single() to not print info about removed LV.
Replace open_count check with lv_check_not_in_use() for snapshot open test. Replace open_count check with lv_check_not_in_use() for snapshot open test.
Add error messages with LV names for failing lv refresh. Add error messages with LV names for failing lv refresh.
Compile/link daemons with RELRO and PIE options to harden daemon security. Compile/link daemons with RELRO and PIE options to harden daemon security.

6
lib/metadata/lv_manip.c
View File

@ -4482,7 +4482,7 @@ void lv_set_hidden(struct logical_volume *lv)
} }
int lv_remove_single(struct cmd_context *cmd, struct logical_volume *lv, int lv_remove_single(struct cmd_context *cmd, struct logical_volume *lv,
const force_t force) force_t force, int silent)
{ {
struct volume_group *vg; struct volume_group *vg;
struct lvinfo info; struct lvinfo info;
@ -4639,7 +4639,7 @@ int lv_remove_single(struct cmd_context *cmd, struct logical_volume *lv,
backup(vg); backup(vg);
if (visible) if (!silent && visible)
log_print_unless_silent("Logical volume \"%s\" successfully removed", lv->name); log_print_unless_silent("Logical volume \"%s\" successfully removed", lv->name);
return 1; return 1;
@ -4764,7 +4764,7 @@ int lv_remove_with_dependencies(struct cmd_context *cmd, struct logical_volume *
"to a thin pool. Proceed? [y/n]: ", lv->name) == 'n')) "to a thin pool. Proceed? [y/n]: ", lv->name) == 'n'))
goto no_remove; goto no_remove;
return lv_remove_single(cmd, lv, force); return lv_remove_single(cmd, lv, force, 0);
no_remove: no_remove:
log_error("Logical volume \"%s\" not removed.", lv->name); log_error("Logical volume \"%s\" not removed.", lv->name);

2
lib/metadata/metadata-exported.h
View File

@ -657,7 +657,7 @@ int lv_extend(struct logical_volume *lv,
int lv_remove(struct logical_volume *lv); int lv_remove(struct logical_volume *lv);
int lv_remove_single(struct cmd_context *cmd, struct logical_volume *lv, int lv_remove_single(struct cmd_context *cmd, struct logical_volume *lv,
force_t force); force_t force, int silent);
int lv_remove_with_dependencies(struct cmd_context *cmd, struct logical_volume *lv, int lv_remove_with_dependencies(struct cmd_context *cmd, struct logical_volume *lv,
force_t force, unsigned level); force_t force, unsigned level);

2
liblvm/lvm_lv.c
View File

@ -206,7 +206,7 @@ int lvm_vg_remove_lv(lv_t lv)
return -1; return -1;
if (!vg_check_write_mode(lv->vg)) if (!vg_check_write_mode(lv->vg))
return -1; return -1;
if (!lv_remove_single(lv->vg->cmd, lv, DONT_PROMPT)) if (!lv_remove_single(lv->vg->cmd, lv, DONT_PROMPT, 0))
return -1; return -1;
return 0; return 0;
} }

2
tools/lvconvert.c
View File

@ -683,7 +683,7 @@ static int _finish_lvconvert_merge(struct cmd_context *cmd,
} }
log_print_unless_silent("Merge of snapshot into logical volume %s has finished.", lv->name); log_print_unless_silent("Merge of snapshot into logical volume %s has finished.", lv->name);
if (!lv_remove_single(cmd, snap_seg->cow, DONT_PROMPT)) { if (!lv_remove_single(cmd, snap_seg->cow, DONT_PROMPT, 0)) {
log_error("Could not remove snapshot %s merged into %s.", log_error("Could not remove snapshot %s merged into %s.",
snap_seg->cow->name, lv->name); snap_seg->cow->name, lv->name);
return 0; return 0;