shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-03-11 20:58:50 +03:00
Code Releases Activity

Missing VG lock when iterating through all LVs.

Browse Source
This commit is contained in:
Alasdair Kergon 2002-04-15 16:27:39 +00:00
parent 70d7918634
commit d6a766f138
6 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/lvchange.c
View File

@ -51,7 +51,7 @@ int lvchange(struct cmd_context *cmd, int argc, char **argv)
return EINVALID_CMD_LINE; return EINVALID_CMD_LINE;
} }
return process_each_lv(cmd, argc, argv, &lvchange_single); return process_each_lv(cmd, argc, argv, LCK_VG_WRITE, &lvchange_single);
} }
static int lvchange_single(struct cmd_context *cmd, struct logical_volume *lv) static int lvchange_single(struct cmd_context *cmd, struct logical_volume *lv)

2
tools/lvdisplay.c
View File

@ -42,5 +42,5 @@ int lvdisplay(struct cmd_context *cmd, int argc, char **argv)
return EINVALID_CMD_LINE; return EINVALID_CMD_LINE;
} }
return process_each_lv(cmd, argc, argv, &lvdisplay_single); return process_each_lv(cmd, argc, argv, LCK_VG_READ, &lvdisplay_single);
} }

2
tools/lvremove.c
View File

@ -29,7 +29,7 @@ int lvremove(struct cmd_context *cmd, int argc, char **argv)
return EINVALID_CMD_LINE; return EINVALID_CMD_LINE;
} }
return process_each_lv(cmd, argc, argv, &lvremove_single); return process_each_lv(cmd, argc, argv, LCK_VG_READ, &lvremove_single);
} }
static int lvremove_single(struct cmd_context *cmd, struct logical_volume *lv) static int lvremove_single(struct cmd_context *cmd, struct logical_volume *lv)

2
tools/lvscan.c
View File

@ -29,7 +29,7 @@ int lvscan(struct cmd_context *cmd, int argc, char **argv)
return EINVALID_CMD_LINE; return EINVALID_CMD_LINE;
} }
return process_each_lv(cmd, argc, argv, &lvscan_single); return process_each_lv(cmd, argc, argv, LCK_VG_READ, &lvscan_single);
/*********** FIXME Count! Add private struct to process_each* /*********** FIXME Count! Add private struct to process_each*
* if (!lv_total) * if (!lv_total)

15
tools/toollib.c
View File

@ -35,6 +35,7 @@ int process_each_lv_in_vg(struct cmd_context *cmd, struct volume_group *vg,
} }
int process_each_lv(struct cmd_context *cmd, int argc, char **argv, int process_each_lv(struct cmd_context *cmd, int argc, char **argv,
int lock_type,
int (*process_single) (struct cmd_context * cmd, int (*process_single) (struct cmd_context * cmd,
struct logical_volume * lv)) struct logical_volume * lv))
{ {
@ -63,17 +64,23 @@ int process_each_lv(struct cmd_context *cmd, int argc, char **argv,
} }
log_verbose("Finding volume group \"%s\"", vg_name); log_verbose("Finding volume group \"%s\"", vg_name);
if (!lock_vol(cmd, vg_name, lock_type)) {
log_error("Can't lock %s: skipping", vg_name);
continue;
}
if (!(vg = cmd->fid->ops->vg_read(cmd->fid, vg_name))) { if (!(vg = cmd->fid->ops->vg_read(cmd->fid, vg_name))) {
log_error("Volume group \"%s\" doesn't exist", log_error("Volume group \"%s\" doesn't exist",
vg_name); vg_name);
if (ret_max < ECMD_FAILED) if (ret_max < ECMD_FAILED)
ret_max = ECMD_FAILED; ret_max = ECMD_FAILED;
unlock_vg(cmd, vg_name);
continue; continue;
} }
if (vg->status & EXPORTED_VG) { if (vg->status & EXPORTED_VG) {
log_error("Volume group \"%s\" is exported", log_error("Volume group \"%s\" is exported",
vg->name); vg->name);
unlock_vg(cmd, vg_name);
return ECMD_FAILED; return ECMD_FAILED;
} }
@ -83,6 +90,7 @@ int process_each_lv(struct cmd_context *cmd, int argc, char **argv,
lv_name, vg_name); lv_name, vg_name);
if (ret_max < ECMD_FAILED) if (ret_max < ECMD_FAILED)
ret_max = ECMD_FAILED; ret_max = ECMD_FAILED;
unlock_vg(cmd, vg_name);
continue; continue;
} }
@ -90,6 +98,7 @@ int process_each_lv(struct cmd_context *cmd, int argc, char **argv,
if ((ret = process_single(cmd, lv)) > ret_max) if ((ret = process_single(cmd, lv)) > ret_max)
ret_max = ret; ret_max = ret;
unlock_vg(cmd, vg_name);
} }
} else { } else {
log_verbose("Finding all logical volumes"); log_verbose("Finding all logical volumes");
@ -99,14 +108,20 @@ int process_each_lv(struct cmd_context *cmd, int argc, char **argv,
} }
list_iterate(vgh, vgs) { list_iterate(vgh, vgs) {
vg_name = list_item(vgh, struct name_list)->name; vg_name = list_item(vgh, struct name_list)->name;
if (!lock_vol(cmd, vg_name, lock_type)) {
log_error("Can't lock %s: skipping", vg_name);
continue;
}
if (!(vg = cmd->fid->ops->vg_read(cmd->fid, vg_name))) { if (!(vg = cmd->fid->ops->vg_read(cmd->fid, vg_name))) {
log_error("Volume group \"%s\" not found", log_error("Volume group \"%s\" not found",
vg_name); vg_name);
if (ret_max < ECMD_FAILED) if (ret_max < ECMD_FAILED)
ret_max = ECMD_FAILED; ret_max = ECMD_FAILED;
unlock_vg(cmd, vg_name);
continue; continue;
} }
ret = process_each_lv_in_vg(cmd, vg, process_single); ret = process_each_lv_in_vg(cmd, vg, process_single);
unlock_vg(cmd, vg_name);
if (ret > ret_max) if (ret > ret_max)
ret_max = ret; ret_max = ret;
vg_count++; vg_count++;

1
tools/toollib.h
View File

@ -40,6 +40,7 @@ int process_each_pv(struct cmd_context *cmd, int argc, char **argv,
struct volume_group * vg, struct volume_group * vg,
struct physical_volume * pv)); struct physical_volume * pv));
int process_each_lv(struct cmd_context *cmd, int argc, char **argv, int process_each_lv(struct cmd_context *cmd, int argc, char **argv,
int lock_type,
int (*process_single) (struct cmd_context * cmd, int (*process_single) (struct cmd_context * cmd,
struct logical_volume * lv)); struct logical_volume * lv));