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

cleanup: simpler checks first

Browse Source 
Minor optimizatoins...
This commit is contained in:
Zdenek Kabelac 2021-03-04 17:05:10 +01:00
parent f4200acac2
commit e5456c259f
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/format_text/archiver.c
View File

@ -103,13 +103,13 @@ static int _archive(struct volume_group *vg, int compulsory)
{
char *desc;
if (vg_is_archived(vg))
return 1; /* VG has been already archived */
/* Don't archive orphan VGs. */
if (is_orphan_vg(vg->name))
return 1;
if (vg_is_archived(vg))
return 1; /* VG has been already archived */
if (!vg->cmd->archive_params->enabled || !vg->cmd->archive_params->dir) {
vg->status |= ARCHIVED_VG;
return 1;

2
lib/metadata/merge.c
View File

@ -371,7 +371,7 @@ static void _check_lv_segment(struct logical_volume *lv, struct lv_segment *seg,
seg_error("sets cleaner_policy");
}
if (lv_is_cache(lv) && seg->pool_lv && lv_is_cache_vol(seg->pool_lv)) {
if (seg->pool_lv && lv_is_cache(lv) && lv_is_cache_vol(seg->pool_lv)) {
cache_setting_seg = seg;
no_metadata_format = 1;
}

2
lib/metadata/snapshot_manip.c
View File

@ -31,7 +31,7 @@ int lv_is_origin(const struct logical_volume *lv)
int lv_is_cow(const struct logical_volume *lv)
{
/* Make sure a merging thin origin isn't confused as a cow LV */
return (!lv_is_thin_volume(lv) && !lv_is_origin(lv) && lv->snapshot) ? 1 : 0;
return (lv->snapshot && !lv_is_thin_volume(lv) && !lv_is_origin(lv)) ? 1 : 0;
}
struct logical_volume *find_cow(const struct logical_volume *snap)