public inbox for lvm2-cvs@sourceware.org
help / color / mirror / Atom feed
* LVM2/lib/format_text format-text.c text_label.c
@ 2010-06-28 20:30 wysochanski
0 siblings, 0 replies; 2+ messages in thread
From: wysochanski @ 2010-06-28 20:30 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: wysochanski@sourceware.org 2010-06-28 20:30:46
Modified files:
lib/format_text: format-text.c text_label.c
Log message:
Move dev_open/dev_close outside vgname_from_mda().
Refactor vgname_from_mda() so caller must open/close the device.
Should be no functional change.
Signed-off-by: Dave Wysochanski <dwysocha@redhat.com>
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/format_text/format-text.c.diff?cvsroot=lvm2&r1=1.125&r2=1.126
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/format_text/text_label.c.diff?cvsroot=lvm2&r1=1.28&r2=1.29
--- LVM2/lib/format_text/format-text.c 2010/06/28 20:30:30 1.125
+++ LVM2/lib/format_text/format-text.c 2010/06/28 20:30:46 1.126
@@ -1099,9 +1099,6 @@
if (mda_free_sectors)
*mda_free_sectors = ((dev_area->size - MDA_HEADER_SIZE) / 2) >> SECTOR_SHIFT;
- if (!dev_open(dev_area->dev))
- return_NULL;
-
if (!(mdah = _raw_read_mda_header(fmt, dev_area)))
goto_out;
@@ -1179,9 +1176,6 @@
}
out:
- if (!dev_close(dev_area->dev))
- stack;
-
return vgname;
}
@@ -1202,20 +1196,20 @@
dm_list_iterate_items(rl, raw_list) {
/* FIXME We're reading mdah twice here... */
+ if (!dev_open(rl->dev_area.dev)) {
+ stack;
+ continue;
+ }
+
if ((vgname = vgname_from_mda(fmt, &rl->dev_area, &vgid, &vgstatus,
NULL, NULL))) {
- if (!dev_open(rl->dev_area.dev)) {
- stack;
- continue;
- }
-
vg = _vg_read_raw_area(&fid, vgname, &rl->dev_area, 0);
if (vg)
lvmcache_update_vg(vg, 0);
- if (!dev_close(rl->dev_area.dev))
- stack;
}
+ if (!dev_close(rl->dev_area.dev))
+ stack;
}
return 1;
--- LVM2/lib/format_text/text_label.c 2010/06/28 20:30:14 1.28
+++ LVM2/lib/format_text/text_label.c 2010/06/28 20:30:46 1.29
@@ -299,6 +299,10 @@
dm_list_iterate_items(mda, &info->mdas) {
mdac = (struct mda_context *) mda->metadata_locn;
+ if (!dev_open(mdac->area.dev)) {
+ stack;
+ continue;
+ }
if ((vgname = vgname_from_mda(info->fmt, &mdac->area,
&vgid, &vgstatus, &creation_host,
&mdac->free_sectors)) &&
@@ -306,6 +310,8 @@
(char *) &vgid, vgstatus,
creation_host))
return_0;
+ if (!dev_close(mdac->area.dev))
+ stack;
}
info->status &= ~CACHE_INVALID;
^ permalink raw reply [flat|nested] 2+ messages in thread
* LVM2/lib/format_text format-text.c text_label.c
@ 2010-06-28 20:31 wysochanski
0 siblings, 0 replies; 2+ messages in thread
From: wysochanski @ 2010-06-28 20:31 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: wysochanski@sourceware.org 2010-06-28 20:31:18
Modified files:
lib/format_text: format-text.c text_label.c
Log message:
Ensure in-memory state matches on-disk state of mda ignore bit.
Signed-off-by: Dave Wysochanski <dwysocha@redhat.com>
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/format_text/format-text.c.diff?cvsroot=lvm2&r1=1.127&r2=1.128
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/format_text/text_label.c.diff?cvsroot=lvm2&r1=1.30&r2=1.31
--- LVM2/lib/format_text/format-text.c 2010/06/28 20:31:01 1.127
+++ LVM2/lib/format_text/format-text.c 2010/06/28 20:31:18 1.128
@@ -726,6 +726,7 @@
"header at %" PRIu64, vg->name,
dev_name(mdac->area.dev), mdac->area.start);
+ rlocn_set_ignored(mdah->raw_locns, mda_is_ignored(mda));
if (!_raw_write_mda_header(fid->fmt, mdac->area.dev, mdac->area.start,
mdah)) {
dm_pool_free(fid->fmt->cmd->mem, mdah);
@@ -808,6 +809,7 @@
rlocn->offset = 0;
rlocn->size = 0;
rlocn->checksum = 0;
+ rlocn_set_ignored(mdah->raw_locns, mda_is_ignored(mda));
if (!_raw_write_mda_header(fid->fmt, mdac->area.dev, mdac->area.start,
mdah)) {
@@ -1513,6 +1515,7 @@
mdac = mda->metadata_locn;
memset(&buf, 0, sizeof(buf));
mdah->size = mdac->area.size;
+ rlocn_set_ignored(mdah->raw_locns, mda_is_ignored(mda));
if (!_raw_write_mda_header(fmt, mdac->area.dev,
mdac->area.start, mdah)) {
if (!dev_close(pv->dev))
--- LVM2/lib/format_text/text_label.c 2010/06/28 20:31:01 1.30
+++ LVM2/lib/format_text/text_label.c 2010/06/28 20:31:18 1.31
@@ -301,6 +301,7 @@
dm_list_iterate_items(mda, &info->mdas) {
mdac = (struct mda_context *) mda->metadata_locn;
if (!dev_open(mdac->area.dev)) {
+ mda_set_ignored(mda, 1);
stack;
continue;
}
@@ -308,6 +309,7 @@
stack;
goto close_dev;
}
+ mda_set_ignored(mda, rlocn_is_ignored(mdah->raw_locns));
if ((vgname = vgname_from_mda(info->fmt, mdah,
&mdac->area,
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-06-28 20:31 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-06-28 20:30 LVM2/lib/format_text format-text.c text_label.c wysochanski
2010-06-28 20:31 wysochanski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).