shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-23 21:35:29 +03:00
Code Releases Activity

move find_pv_by_name to lib

Browse Source
This commit is contained in:
Alasdair Kergon 2004-05-05 11:04:28 +00:00
parent 0725588731
commit 25b705c3a8
3 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/metadata/metadata.c
View File

@ -418,6 +418,24 @@ struct physical_volume *find_pv(struct volume_group *vg, struct device *dev)
return NULL;
}
struct physical_volume *find_pv_by_name(struct cmd_context *cmd,
const char *pv_name)
{
struct physical_volume *pv;
if (!(pv = pv_read(cmd, pv_name, NULL, NULL))) {
log_error("Physical volume %s not found", pv_name);
return NULL;
}
if (!pv->vg_name[0]) {
log_error("Physical volume %s not in a volume group", pv_name);
return NULL;
}
return pv;
}
/* Find segment at a given logical extent in an LV */
struct lv_segment *find_seg_by_le(struct logical_volume *lv, uint32_t le)
{

2
lib/metadata/metadata.h
View File

@ -459,6 +459,8 @@ struct logical_volume *lv_from_lvid(struct cmd_context *cmd,
/* FIXME Merge these functions with ones above */
struct physical_volume *find_pv(struct volume_group *vg, struct device *dev);
struct logical_volume *find_lv(struct volume_group *vg, const char *lv_name);
struct physical_volume *find_pv_by_name(struct cmd_context *cmd,
const char *pv_name);
/* Find LV segment containing given LE */
struct lv_segment *find_seg_by_le(struct logical_volume *lv, uint32_t le);

22
tools/pvmove.c
View File

@ -102,24 +102,6 @@ static const char *_extract_lvname(struct cmd_context *cmd, const char *vgname,
return lvname;
}
static struct physical_volume *_find_pv_by_name(struct cmd_context *cmd,
const char *pv_name)
{
struct physical_volume *pv;
if (!(pv = pv_read(cmd, pv_name, NULL, NULL))) {
log_error("Physical volume %s not found", pv_name);
return NULL;
}
if (!pv->vg_name[0]) {
log_error("Physical volume %s not in a volume group", pv_name);
return NULL;
}
return pv;
}
static struct volume_group *_get_vg(struct cmd_context *cmd, const char *vgname)
{
int consistent = 1;
@ -315,7 +297,7 @@ static int _set_up_pvmove(struct cmd_context *cmd, const char *pv_name,
int first_time = 1;
/* Find PV (in VG) */
if (!(pv = _find_pv_by_name(cmd, pv_name))) {
if (!(pv = find_pv_by_name(cmd, pv_name))) {
stack;
return EINVALID_CMD_LINE;
}
@ -541,7 +523,7 @@ static int _wait_for_single_pvmove(struct cmd_context *cmd, const char *pv_name,
if (parms->interval && !parms->aborting)
sleep(parms->interval);
if (!(pv = _find_pv_by_name(cmd, pv_name))) {
if (!(pv = find_pv_by_name(cmd, pv_name))) {
log_error("ABORTING: Can't reread PV %s", pv_name);
return 0;
}