From 99a5d8a9c494847528e9ada989e55174814f808a Mon Sep 17 00:00:00 2001 From: Alasdair Kergon Date: Wed, 15 Jul 2009 17:26:26 +0000 Subject: [PATCH] Revert broken commit: 2009-07-15 06:10:51 Un-export vg_read_internal. lvm-functions.c:774: warning: implicit declaration of function 'vg_read_internal' --- lib/metadata/metadata-exported.h | 2 ++ lib/metadata/metadata.c | 26 +++++++++++--------------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/lib/metadata/metadata-exported.h b/lib/metadata/metadata-exported.h index d768804ab..9d8d5425d 100644 --- a/lib/metadata/metadata-exported.h +++ b/lib/metadata/metadata-exported.h @@ -343,6 +343,8 @@ struct lv_list { int vg_write(struct volume_group *vg); int vg_commit(struct volume_group *vg); int vg_revert(struct volume_group *vg); +struct volume_group *vg_read_internal(struct cmd_context *cmd, const char *vg_name, + const char *vgid, int *consistent); struct physical_volume *pv_read(struct cmd_context *cmd, const char *pv_name, struct dm_list *mdas, uint64_t *label_sector, int warnings, int scan_label_only); diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c index c4ff4cf70..7f85d7ce4 100644 --- a/lib/metadata/metadata.c +++ b/lib/metadata/metadata.c @@ -31,9 +31,6 @@ #include -static struct volume_group *_vg_read_internal(struct cmd_context *cmd, - const char *vgname, - const char *vgid, int *consistent); /* * FIXME: Check for valid handle before dereferencing field or log error? */ @@ -253,8 +250,8 @@ int get_pv_from_vg_by_id(const struct format_type *fmt, const char *vg_name, struct pv_list *pvl; int r = 0, consistent = 0; - if (!(vg = _vg_read_internal(fmt->cmd, vg_name, vgid, &consistent))) { - log_error("get_pv_from_vg_by_id: _vg_read_internal failed to read VG %s", + if (!(vg = vg_read_internal(fmt->cmd, vg_name, vgid, &consistent))) { + log_error("get_pv_from_vg_by_id: vg_read_internal failed to read VG %s", vg_name); return 0; } @@ -626,7 +623,7 @@ vg_t *vg_create(struct cmd_context *cmd, const char *vg_name) /* FIXME: Is this vg_read_internal necessary? Move it inside vg_lock_newname? */ /* is this vg name already in use ? */ - if ((vg = _vg_read_internal(cmd, vg_name, NULL, &consistent))) { + if ((vg = vg_read_internal(cmd, vg_name, NULL, &consistent))) { log_error("A volume group called '%s' already exists.", vg_name); unlock_and_release_vg(cmd, vg, vg_name); return _vg_make_handle(cmd, NULL, FAILED_EXIST); @@ -2042,7 +2039,7 @@ static struct volume_group *_vg_read(struct cmd_context *cmd, if (is_orphan_vg(vgname)) { if (use_precommitted) { - log_error("Internal error: _vg_read_internal requires vgname " + log_error("Internal error: vg_read_internal requires vgname " "with pre-commit."); return NULL; } @@ -2331,9 +2328,8 @@ static struct volume_group *_vg_read(struct cmd_context *cmd, return correct_vg; } -static struct volume_group *_vg_read_internal(struct cmd_context *cmd, - const char *vgname, - const char *vgid, int *consistent) +struct volume_group *vg_read_internal(struct cmd_context *cmd, const char *vgname, + const char *vgid, int *consistent) { struct volume_group *vg; struct lv_list *lvl; @@ -2374,7 +2370,7 @@ void vg_release(struct volume_group *vg) /* 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 - * the _vg_read_internal is therefore safe. + * the vg_read_internal is therefore safe. */ static struct volume_group *_vg_read_by_vgid(struct cmd_context *cmd, const char *vgid, @@ -2407,7 +2403,7 @@ static struct volume_group *_vg_read_by_vgid(struct cmd_context *cmd, if (memlock()) goto out; - /* FIXME Need a genuine read by ID here - don't _vg_read_internal 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 * allowed to do a full scan here any more. */ @@ -2598,7 +2594,7 @@ static int _get_pvs(struct cmd_context *cmd, struct dm_list **pvslist) stack; continue; } - if (!(vg = _vg_read_internal(cmd, vgname, vgid, &consistent))) { + if (!(vg = vg_read_internal(cmd, vgname, vgid, &consistent))) { stack; continue; } @@ -2856,7 +2852,7 @@ static vg_t *_recover_vg(struct cmd_context *cmd, const char *lock_name, if (!lock_vol(cmd, lock_name, lock_flags)) return_NULL; - if (!(vg = _vg_read_internal(cmd, vg_name, vgid, &consistent))) + if (!(vg = vg_read_internal(cmd, vg_name, vgid, &consistent))) return_NULL; if (!consistent) { @@ -2913,7 +2909,7 @@ static vg_t *_vg_lock_and_read(struct cmd_context *cmd, const char *vg_name, consistent_in = consistent; /* If consistent == 1, we get NULL here if correction fails. */ - if (!(vg = _vg_read_internal(cmd, vg_name, vgid, &consistent))) { + if (!(vg = vg_read_internal(cmd, vg_name, vgid, &consistent))) { if (consistent_in && !consistent) { log_error("Volume group \"%s\" inconsistent.", vg_name); failure |= FAILED_INCONSISTENT; -- 2.43.5