From: Dave Wysochanski Date: Tue, 9 Feb 2010 17:32:10 -0500 Subject: [PATCH 07/21] Ensure in-memory state matches on-disk state of mda disable bit. In-Reply-To: <1265754744-17319-7-git-send-email-dwysocha@redhat.com> References: <1265754744-17319-1-git-send-email-dwysocha@redhat.com> <1265754744-17319-2-git-send-email-dwysocha@redhat.com> <1265754744-17319-3-git-send-email-dwysocha@redhat.com> <1265754744-17319-4-git-send-email-dwysocha@redhat.com> <1265754744-17319-5-git-send-email-dwysocha@redhat.com> <1265754744-17319-6-git-send-email-dwysocha@redhat.com> <1265754744-17319-7-git-send-email-dwysocha@redhat.com> Message-ID: <1265754744-17319-8-git-send-email-dwysocha@redhat.com> List-Id: To: lvm-devel@redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Signed-off-by: Dave Wysochanski --- lib/format_text/format-text.c | 3 +++ lib/format_text/text_label.c | 2 ++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/lib/format_text/format-text.c b/lib/format_text/format-text.c index 83d1171..4ede905 100644 --- a/lib/format_text/format-text.c +++ b/lib/format_text/format-text.c @@ -704,6 +704,7 @@ static int _vg_commit_raw_rlocn(struct format_instance *fid, "header at %" PRIu64, vg->name, dev_name(mdac->area.dev), mdac->area.start); + rlocn_set_disabled(mdah->raw_locns, mda_is_disabled(mda)); if (!_raw_write_mda_header(fid->fmt, mdac->area.dev, mdac->area.start, mdah)) { dm_pool_free(fid->fmt->cmd->mem, mdah); @@ -786,6 +787,7 @@ static int _vg_remove_raw(struct format_instance *fid, struct volume_group *vg, rlocn->offset = 0; rlocn->size = 0; rlocn->checksum = 0; + rlocn_set_disabled(mdah->raw_locns, mda_is_disabled(mda)); if (!_raw_write_mda_header(fid->fmt, mdac->area.dev, mdac->area.start, mdah)) { @@ -1489,6 +1491,7 @@ static int _text_pv_write(const struct format_type *fmt, struct physical_volume mdac = mda->metadata_locn; memset(&buf, 0, sizeof(buf)); mdah->size = mdac->area.size; + rlocn_set_disabled(mdah->raw_locns, mda_is_disabled(mda)); if (!_raw_write_mda_header(fmt, mdac->area.dev, mdac->area.start, mdah)) { if (!dev_close(pv->dev)) diff --git a/lib/format_text/text_label.c b/lib/format_text/text_label.c index 7083b89..cac4657 100644 --- a/lib/format_text/text_label.c +++ b/lib/format_text/text_label.c @@ -301,6 +301,7 @@ static int _text_read(struct labeller *l, struct device *dev, void *buf, dm_list_iterate_items(mda, &info->mdas) { mdac = (struct mda_context *) mda->metadata_locn; if (!dev_open(mdac->area.dev)) { + mda_set_disabled(mda, 1); stack; continue; } @@ -308,6 +309,7 @@ static int _text_read(struct labeller *l, struct device *dev, void *buf, stack; goto close_dev; } + mda_set_disabled(mda, rlocn_is_disabled(mdah->raw_locns)); if ((vgname = vgname_from_mda(info->fmt, mdah, &mdac->area, -- 1.6.0.6