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

lvconvert: enhance disable reshaping of open RAID LV

Browse Source 
Enhance commit 9e9163618a
to use dev_open_flags/dev_close API.

Related: rhbz1447812
This commit is contained in:
Heinz Mauelshagen 2017-06-20 17:27:58 +02:00
parent 31cd01c9b3
commit 601ad1c73f
1 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
lib/metadata/raid_manip.c
View File

@ -6210,6 +6210,26 @@ static int _conversion_options_allowed(const struct lv_segment *seg_from,
return r;
}
/* BZ1447812: try opening LV exclusively */
static int _lv_open_excl(struct logical_volume *lv, struct device **dev) {
char *dev_path;
size_t sz = strlen(lv->vg->cmd->dev_dir) + strlen(lv->vg->name) + strlen(lv->name) + 2;
*dev = NULL;
if (!(dev_path = dm_pool_alloc(lv->vg->cmd->mem, sz)))
return_0;
if (dm_snprintf(dev_path, sz, "%s%s/%s", lv->vg->cmd->dev_dir, lv->vg->name, lv->name) < 0)
return_0;
if (!(*dev = dev_create_file(dev_path, NULL, NULL, 0)))
return_0;
if (!dev_open_flags(*dev, O_EXCL, 1, 1)) {
log_error("Reshape of open %s not supported.", display_lvname(lv));
return 0;
}
return 1;
}
/*
* lv_raid_convert
*
@ -6259,8 +6279,7 @@ int lv_raid_convert(struct logical_volume *lv,
uint32_t region_size;
uint32_t data_copies = seg->data_copies;
uint32_t available_slvs, removed_slvs;
char *dev_path;
size_t sz;
struct device *dev;
takeover_fn_t takeover_fn;
/* FIXME If not active, prompt and activate */
@ -6331,24 +6350,19 @@ int lv_raid_convert(struct logical_volume *lv,
return 0;
}
/* BZ1447812 */
sz = strlen(lv->vg->cmd->dev_dir) + strlen(lv->vg->name) + strlen(lv->name) + 2;
if (!(dev_path = dm_pool_alloc(lv->vg->cmd->mem, sz)))
return_0;
if (dm_snprintf(dev_path, sz, "%s%s/%s", lv->vg->cmd->dev_dir, lv->vg->name, lv->name) < 0)
return_0;
if (open(dev_path, O_RDONLY|O_EXCL) && errno) {
log_error("Reshape of open %s not supported.", display_lvname(lv));
/* BZ1447812: reject reshape on open LV */
if (!_lv_open_excl(lv, &dev))
return 0;
}
if (!_raid_reshape(lv, new_segtype, yes, force,
data_copies, region_size,
stripes, stripe_size, allocate_pvs)) {
dev_close(dev);
log_error("Reshape request failed on LV %s.", display_lvname(lv));
return 0;
}
dev_close(dev);
return 1;
case 2:
log_error("Invalid conversion request on %s.", display_lvname(lv));