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

thin: shuffle code

Browse Source 
Reorder code lines for next patch.
This commit is contained in:
Zdenek Kabelac 2012-12-02 16:27:39 +01:00
parent 0be8a9126f
commit f0da2842cf
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
tools/lvconvert.c
View File

@ -1917,12 +1917,6 @@ static int _lvconvert_thinpool(struct cmd_context *cmd,
return 0; return 0;
} }
/* Rename deactivated metadata LV to have _tmeta suffix */
/* Implicit checks if metadata_lv is visible */
if (strcmp(metadata_lv->name, name) &&
!lv_rename_update(cmd, metadata_lv, name, 0))
return_0;
/* /*
* Since we wish to have underlaying dev, to match _tdata * Since we wish to have underlaying dev, to match _tdata
* rename data LV first, also checks for visible LV * rename data LV first, also checks for visible LV
@ -1940,20 +1934,26 @@ static int _lvconvert_thinpool(struct cmd_context *cmd,
seg->segtype = lp->segtype; seg->segtype = lp->segtype;
seg->lv->status |= THIN_POOL; seg->lv->status |= THIN_POOL;
seg->chunk_size = lp->chunk_size;
seg->zero_new_blocks = lp->zero ? 1 : 0;
seg->discards = lp->discards;
seg->low_water_mark = 0;
seg->transaction_id = 0;
if (!attach_pool_metadata_lv(seg, metadata_lv))
return_0;
/* Drop reference as attach_pool_data_lv() takes it again */ /* Drop reference as attach_pool_data_lv() takes it again */
remove_seg_from_segs_using_this_lv(data_lv, seg); remove_seg_from_segs_using_this_lv(data_lv, seg);
if (!attach_pool_data_lv(seg, data_lv)) if (!attach_pool_data_lv(seg, data_lv))
return_0; return_0;
seg->low_water_mark = 0;
seg->transaction_id = 0;
seg->chunk_size = lp->chunk_size;
seg->discards = lp->discards;
seg->zero_new_blocks = lp->zero ? 1 : 0;
/* Rename deactivated metadata LV to have _tmeta suffix */
/* Implicit checks if metadata_lv is visible */
if (strcmp(metadata_lv->name, name) &&
!lv_rename_update(cmd, metadata_lv, name, 0))
return_0;
if (!attach_pool_metadata_lv(seg, metadata_lv))
return_0;
if (!vg_write(pool_lv->vg) || !vg_commit(pool_lv->vg)) if (!vg_write(pool_lv->vg) || !vg_commit(pool_lv->vg))
return_0; return_0;