diff options
| author | Zdenek Kabelac <zkabelac@redhat.com> | 2014-04-01 20:06:54 +0200 |
|---|---|---|
| committer | Zdenek Kabelac <zkabelac@redhat.com> | 2014-04-01 20:18:05 +0200 |
| commit | d58cc2c0fc7cd8fd658b03d6fabdfbdf757562c8 (patch) | |
| tree | a9205b5316bd81a623aa3869cd7ccbb496efb18b | |
| parent | e72dea55bf3ba3b03014b2f04edeb048ade296eb (diff) | |
| download | lvm2-d58cc2c0fc7cd8fd658b03d6fabdfbdf757562c8.tar.gz | |
cleanup: cache reuse code for pool test
Using same error message for pool associated devices.
| -rw-r--r-- | lib/metadata/lv_manip.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c index 2da6ae183..5d2cdb906 100644 --- a/lib/metadata/lv_manip.c +++ b/lib/metadata/lv_manip.c @@ -4681,19 +4681,14 @@ int lv_remove_single(struct cmd_context *cmd, struct logical_volume *lv, return 0; } - if (lv_is_thin_pool_data(lv) || lv_is_thin_pool_metadata(lv)) { - log_error("Can't remove logical volume %s used by a thin pool.", + if (lv_is_thin_pool_data(lv) || lv_is_thin_pool_metadata(lv) || + lv_is_cache_pool_data(lv) || lv_is_cache_pool_metadata(lv)) { + log_error("Can't remove logical volume %s used by a pool.", lv->name); return 0; } else if (lv_is_thin_volume(lv)) pool_lv = first_seg(lv)->pool_lv; - if (lv_is_cache_pool_data(lv) || lv_is_cache_pool_metadata(lv)) { - log_error("Can't remove logical volume %s used by a cache_pool.", - lv->name); - return 0; - } - if (lv->status & LOCKED) { log_error("Can't remove locked LV %s", lv->name); return 0; |