shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-03-10 16:58:47 +03:00
Code Releases Activity

Rename vg_read() to vg_read_internal(). (mornfall)

Browse Source
This commit is contained in:
Alasdair Kergon 2009-01-26 19:01:32 +00:00
parent 302125622a
commit 8544a8a254
12 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW
View File

@ -1,5 +1,6 @@
Version 2.02.45 - Version 2.02.45 -
=================================== ===================================
Rename vg_read() to vg_read_internal().
Version 2.02.44 - 26th January 2009 Version 2.02.44 - 26th January 2009
=================================== ===================================

2
daemons/clvmd/lvm-functions.c
View File

@ -711,7 +711,7 @@ void lvm_do_backup(const char *vgname)
DEBUGLOG("Triggering backup of VG metadata for %s. suspended=%d\n", vgname, suspended); DEBUGLOG("Triggering backup of VG metadata for %s. suspended=%d\n", vgname, suspended);
vg = vg_read(cmd, vgname, NULL /*vgid*/, &consistent); vg = vg_read_internal(cmd, vgname, NULL /*vgid*/, &consistent);
if (vg) { if (vg) {
if (consistent) if (consistent)
check_current_backup(vg); check_current_backup(vg);

4
lib/metadata/metadata-exported.h
View File

@ -76,7 +76,7 @@ struct pv_segment;
written out in metadata*/ written out in metadata*/
//#define POSTORDER_FLAG 0x02000000U /* Not real flags, reserved for //#define POSTORDER_FLAG 0x02000000U /* Not real flags, reserved for
//#define POSTORDER_OPEN_FLAG 0x04000000U temporary use inside vg_read. */ //#define POSTORDER_OPEN_FLAG 0x04000000U temporary use inside vg_read_internal. */
#define LVM_READ 0x00000100U /* LV VG */ #define LVM_READ 0x00000100U /* LV VG */
#define LVM_WRITE 0x00000200U /* LV VG */ #define LVM_WRITE 0x00000200U /* LV VG */
@ -328,7 +328,7 @@ struct lv_list {
int vg_write(struct volume_group *vg); int vg_write(struct volume_group *vg);
int vg_commit(struct volume_group *vg); int vg_commit(struct volume_group *vg);
int vg_revert(struct volume_group *vg); int vg_revert(struct volume_group *vg);
struct volume_group *vg_read(struct cmd_context *cmd, const char *vg_name, struct volume_group *vg_read_internal(struct cmd_context *cmd, const char *vg_name,
const char *vgid, int *consistent); const char *vgid, int *consistent);
struct physical_volume *pv_read(struct cmd_context *cmd, const char *pv_name, struct physical_volume *pv_read(struct cmd_context *cmd, const char *pv_name,
struct dm_list *mdas, uint64_t *label_sector, struct dm_list *mdas, uint64_t *label_sector,

22
lib/metadata/metadata.c
View File

@ -224,8 +224,8 @@ int get_pv_from_vg_by_id(const struct format_type *fmt, const char *vg_name,
struct pv_list *pvl; struct pv_list *pvl;
int consistent = 0; int consistent = 0;
if (!(vg = vg_read(fmt->cmd, vg_name, vgid, &consistent))) { if (!(vg = vg_read_internal(fmt->cmd, vg_name, vgid, &consistent))) {
log_error("get_pv_from_vg_by_id: vg_read failed to read VG %s", log_error("get_pv_from_vg_by_id: vg_read_internal failed to read VG %s",
vg_name); vg_name);
return 0; return 0;
} }
@ -503,7 +503,7 @@ struct volume_group *vg_create(struct cmd_context *cmd, const char *vg_name,
return_NULL; return_NULL;
/* is this vg name already in use ? */ /* is this vg name already in use ? */
if (vg_read(cmd, vg_name, NULL, &consistent)) { if (vg_read_internal(cmd, vg_name, NULL, &consistent)) {
log_err("A volume group called '%s' already exists.", vg_name); log_err("A volume group called '%s' already exists.", vg_name);
goto bad; goto bad;
} }
@ -1684,12 +1684,12 @@ int vg_missing_pv_count(const vg_t *vg)
return ret; return ret;
} }
/* Caller sets consistent to 1 if it's safe for vg_read to correct /* Caller sets consistent to 1 if it's safe for vg_read_internal to correct
* inconsistent metadata on disk (i.e. the VG write lock is held). * inconsistent metadata on disk (i.e. the VG write lock is held).
* This guarantees only consistent metadata is returned. * This guarantees only consistent metadata is returned.
* If consistent is 0, caller must check whether consistent == 1 on return * If consistent is 0, caller must check whether consistent == 1 on return
* and take appropriate action if it isn't (e.g. abort; get write lock * and take appropriate action if it isn't (e.g. abort; get write lock
* and call vg_read again). * and call vg_read_internal again).
* *
* If precommitted is set, use precommitted metadata if present. * If precommitted is set, use precommitted metadata if present.
* *
@ -1716,7 +1716,7 @@ static struct volume_group *_vg_read(struct cmd_context *cmd,
if (is_orphan_vg(vgname)) { if (is_orphan_vg(vgname)) {
if (use_precommitted) { if (use_precommitted) {
log_error("Internal error: vg_read requires vgname " log_error("Internal error: vg_read_internal requires vgname "
"with pre-commit."); "with pre-commit.");
return NULL; return NULL;
} }
@ -1974,7 +1974,7 @@ static struct volume_group *_vg_read(struct cmd_context *cmd,
return correct_vg; return correct_vg;
} }
struct volume_group *vg_read(struct cmd_context *cmd, const char *vgname, struct volume_group *vg_read_internal(struct cmd_context *cmd, const char *vgname,
const char *vgid, int *consistent) const char *vgid, int *consistent)
{ {
struct volume_group *vg; struct volume_group *vg;
@ -2002,7 +2002,7 @@ struct volume_group *vg_read(struct cmd_context *cmd, const char *vgname,
/* This is only called by lv_from_lvid, which is only called from /* This is only called by lv_from_lvid, which is only called from
* activate.c so we know the appropriate VG lock is already held and * activate.c so we know the appropriate VG lock is already held and
* the vg_read is therefore safe. * the vg_read_internal is therefore safe.
*/ */
static struct volume_group *_vg_read_by_vgid(struct cmd_context *cmd, static struct volume_group *_vg_read_by_vgid(struct cmd_context *cmd,
const char *vgid, const char *vgid,
@ -2034,7 +2034,7 @@ static struct volume_group *_vg_read_by_vgid(struct cmd_context *cmd,
if (memlock()) if (memlock())
return NULL; return NULL;
/* FIXME Need a genuine read by ID here - don't vg_read by name! */ /* FIXME Need a genuine read by ID here - don't vg_read_internal by name! */
/* FIXME Disabled vgrenames while active for now because we aren't /* FIXME Disabled vgrenames while active for now because we aren't
* allowed to do a full scan here any more. */ * allowed to do a full scan here any more. */
@ -2218,7 +2218,7 @@ static int _get_pvs(struct cmd_context *cmd, struct dm_list **pvslist)
stack; stack;
continue; continue;
} }
if (!(vg = vg_read(cmd, vgname, vgid, &consistent))) { if (!(vg = vg_read_internal(cmd, vgname, vgid, &consistent))) {
stack; stack;
continue; continue;
} }
@ -2446,7 +2446,7 @@ vg_t *vg_lock_and_read(struct cmd_context *cmd, const char *vg_name,
return NULL; return NULL;
} }
if (!(vg = vg_read(cmd, vg_name, vgid, &consistent)) || if (!(vg = vg_read_internal(cmd, vg_name, vgid, &consistent)) ||
((misc_flags & FAIL_INCONSISTENT) && !consistent)) { ((misc_flags & FAIL_INCONSISTENT) && !consistent)) {
log_error("Volume group \"%s\" not found", vg_name); log_error("Volume group \"%s\" not found", vg_name);
unlock_vg(cmd, vg_name); unlock_vg(cmd, vg_name);

2
lib/metadata/metadata.h
View File

@ -79,7 +79,7 @@
// written out in metadata*/ // written out in metadata*/
#define POSTORDER_FLAG 0x02000000U /* Not real flags, reserved for */ #define POSTORDER_FLAG 0x02000000U /* Not real flags, reserved for */
#define POSTORDER_OPEN_FLAG 0x04000000U /* temporary use inside vg_read. */ #define POSTORDER_OPEN_FLAG 0x04000000U /* temporary use inside vg_read_internal. */
//#define LVM_READ 0x00000100U /* LV VG */ //#define LVM_READ 0x00000100U /* LV VG */
//#define LVM_WRITE 0x00000200U /* LV VG */ //#define LVM_WRITE 0x00000200U /* LV VG */

2
tools/pvdisplay.c
View File

@ -37,7 +37,7 @@ static int _pvdisplay_single(struct cmd_context *cmd,
/* /*
* Replace possibly incomplete PV structure with new one * Replace possibly incomplete PV structure with new one
* allocated in vg_read() path. * allocated in vg_read_internal() path.
*/ */
if (!(pvl = find_pv_in_vg(vg, pv_name))) { if (!(pvl = find_pv_in_vg(vg, pv_name))) {
log_error("Unable to find \"%s\" in volume group \"%s\"", log_error("Unable to find \"%s\" in volume group \"%s\"",

2
tools/pvresize.c
View File

@ -62,7 +62,7 @@ static int _pv_resize_single(struct cmd_context *cmd,
return 0; return 0;
} }
if (!(vg = vg_read(cmd, vg_name, NULL, &consistent))) { if (!(vg = vg_read_internal(cmd, vg_name, NULL, &consistent))) {
unlock_vg(cmd, vg_name); unlock_vg(cmd, vg_name);
log_error("Unable to find volume group of \"%s\"", log_error("Unable to find volume group of \"%s\"",
pv_name); pv_name);

2
tools/reporter.c
View File

@ -136,7 +136,7 @@ static int _pvs_single(struct cmd_context *cmd, struct volume_group *vg,
/* /*
* Replace possibly incomplete PV structure with new one * Replace possibly incomplete PV structure with new one
* allocated in vg_read() path. * allocated in vg_read_internal() path.
*/ */
if (!(pvl = find_pv_in_vg(vg, pv_dev_name(pv)))) { if (!(pvl = find_pv_in_vg(vg, pv_dev_name(pv)))) {
log_error("Unable to find \"%s\" in volume group \"%s\"", log_error("Unable to find \"%s\" in volume group \"%s\"",

8
tools/toollib.c
View File

@ -291,7 +291,7 @@ int process_each_lv(struct cmd_context *cmd, int argc, char **argv,
consistent = 1; consistent = 1;
else else
consistent = 0; consistent = 0;
if (!(vg = vg_read(cmd, vgname, NULL, &consistent)) || !consistent) { if (!(vg = vg_read_internal(cmd, vgname, NULL, &consistent)) || !consistent) {
unlock_vg(cmd, vgname); unlock_vg(cmd, vgname);
if (!vg) if (!vg)
log_error("Volume group \"%s\" " log_error("Volume group \"%s\" "
@ -433,7 +433,7 @@ static int _process_one_vg(struct cmd_context *cmd, const char *vg_name,
} }
log_verbose("Finding volume group \"%s\"", vg_name); log_verbose("Finding volume group \"%s\"", vg_name);
if (!(vg = vg_read(cmd, vg_name, vgid, &consistent))) { if (!(vg = vg_read_internal(cmd, vg_name, vgid, &consistent))) {
log_error("Volume group \"%s\" not found", vg_name); log_error("Volume group \"%s\" not found", vg_name);
unlock_vg(cmd, vg_name); unlock_vg(cmd, vg_name);
return ECMD_FAILED; return ECMD_FAILED;
@ -720,7 +720,7 @@ int process_each_pv(struct cmd_context *cmd, int argc, char **argv,
log_error("Can't lock %s: skipping", sll->str); log_error("Can't lock %s: skipping", sll->str);
continue; continue;
} }
if (!(vg = vg_read(cmd, sll->str, NULL, &consistent))) { if (!(vg = vg_read_internal(cmd, sll->str, NULL, &consistent))) {
log_error("Volume group \"%s\" not found", sll->str); log_error("Volume group \"%s\" not found", sll->str);
unlock_vg(cmd, sll->str); unlock_vg(cmd, sll->str);
ret_max = ECMD_FAILED; ret_max = ECMD_FAILED;
@ -1143,7 +1143,7 @@ struct volume_group *recover_vg(struct cmd_context *cmd, const char *vgname,
return NULL; return NULL;
} }
return vg_read(cmd, vgname, NULL, &consistent); return vg_read_internal(cmd, vgname, NULL, &consistent);
} }
int apply_lvname_restrictions(const char *name) int apply_lvname_restrictions(const char *name)

6
tools/vgreduce.c
View File

@ -426,7 +426,7 @@ static int _vgreduce_single(struct cmd_context *cmd, struct volume_group *vg,
vg->free_count -= pv_pe_count(pv) - pv_pe_alloc_count(pv); vg->free_count -= pv_pe_count(pv) - pv_pe_alloc_count(pv);
vg->extent_count -= pv_pe_count(pv); vg->extent_count -= pv_pe_count(pv);
if(!(orphan_vg = vg_read(cmd, vg->fid->fmt->orphan_vg_name, NULL, &consistent)) || if(!(orphan_vg = vg_read_internal(cmd, vg->fid->fmt->orphan_vg_name, NULL, &consistent)) ||
!consistent) { !consistent) {
log_error("Unable to read existing orphan PVs"); log_error("Unable to read existing orphan PVs");
unlock_vg(cmd, VG_ORPHANS); unlock_vg(cmd, VG_ORPHANS);
@ -520,7 +520,7 @@ int vgreduce(struct cmd_context *cmd, int argc, char **argv)
return ECMD_FAILED; return ECMD_FAILED;
} }
if ((!(vg = vg_read(cmd, vg_name, NULL, &consistent)) || !consistent) if ((!(vg = vg_read_internal(cmd, vg_name, NULL, &consistent)) || !consistent)
&& !repairing) { && !repairing) {
log_error("Volume group \"%s\" doesn't exist", vg_name); log_error("Volume group \"%s\" doesn't exist", vg_name);
unlock_vg(cmd, vg_name); unlock_vg(cmd, vg_name);
@ -541,7 +541,7 @@ int vgreduce(struct cmd_context *cmd, int argc, char **argv)
} }
consistent = !arg_count(cmd, force_ARG); consistent = !arg_count(cmd, force_ARG);
if (!(vg = vg_read(cmd, vg_name, NULL, &consistent))) { if (!(vg = vg_read_internal(cmd, vg_name, NULL, &consistent))) {
log_error("Volume group \"%s\" not found", vg_name); log_error("Volume group \"%s\" not found", vg_name);
unlock_vg(cmd, vg_name); unlock_vg(cmd, vg_name);
return ECMD_FAILED; return ECMD_FAILED;

4
tools/vgrename.c
View File

@ -75,7 +75,7 @@ static int vg_rename_path(struct cmd_context *cmd, const char *old_vg_path,
return 0; return 0;
} }
if (!(vg = vg_read(cmd, vg_name_old, vgid, &consistent)) || !consistent) { if (!(vg = vg_read_internal(cmd, vg_name_old, vgid, &consistent)) || !consistent) {
log_error("Volume group %s %s%s%snot found.", vg_name_old, log_error("Volume group %s %s%s%snot found.", vg_name_old,
vgid ? "(" : "", vgid ? vgid : "", vgid ? ") " : ""); vgid ? "(" : "", vgid ? vgid : "", vgid ? ") " : "");
unlock_vg(cmd, vg_name_old); unlock_vg(cmd, vg_name_old);
@ -107,7 +107,7 @@ static int vg_rename_path(struct cmd_context *cmd, const char *old_vg_path,
} }
consistent = 0; consistent = 0;
if ((vg_new = vg_read(cmd, vg_name_new, NULL, &consistent))) { if ((vg_new = vg_read_internal(cmd, vg_name_new, NULL, &consistent))) {
log_error("New volume group \"%s\" already exists", log_error("New volume group \"%s\" already exists",
vg_name_new); vg_name_new);
goto error; goto error;

4
tools/vgsplit.c
View File

@ -334,7 +334,7 @@ int vgsplit(struct cmd_context *cmd, int argc, char **argv)
} }
consistent = 0; consistent = 0;
if ((vg_to = vg_read(cmd, vg_name_to, NULL, &consistent))) { if ((vg_to = vg_read_internal(cmd, vg_name_to, NULL, &consistent))) {
existing_vg = 1; existing_vg = 1;
if (new_vg_option_specified(cmd)) { if (new_vg_option_specified(cmd)) {
log_error("Volume group \"%s\" exists, but new VG " log_error("Volume group \"%s\" exists, but new VG "
@ -451,7 +451,7 @@ int vgsplit(struct cmd_context *cmd, int argc, char **argv)
*/ */
consistent = 1; consistent = 1;
if (!test_mode() && if (!test_mode() &&
(!(vg_to = vg_read(cmd, vg_name_to, NULL, &consistent)) || (!(vg_to = vg_read_internal(cmd, vg_name_to, NULL, &consistent)) ||
!consistent)) { !consistent)) {
log_error("Volume group \"%s\" became inconsistent: please " log_error("Volume group \"%s\" became inconsistent: please "
"fix manually", vg_name_to); "fix manually", vg_name_to);