From 637ac19e60d27c1bab3abf3f589d104751947e49 Mon Sep 17 00:00:00 2001 From: Dave Wysochanski Date: Tue, 5 Oct 2010 17:34:05 +0000 Subject: [PATCH] Rename 'flags' to 'status' for struct metadata_area. In other LVM memory structures such as volume_group, the field used to store flags is called "status", and on-disk fields are called 'flags', so rename the one inside metadata_area to be consistent. Not only is it more consistent with existing code but is cleaner to say "the status of this mda is ignored". Background for this patch - prajnoha pinged me on IRC this morning about a fix he was working on related to metadataignore when metadata/dirs was set. I was reviewing my patches from this year and realized the 'flags' field was probably not the best choice when I originally did the metadataignore patches. --- WHATS_NEW | 1 + lib/format1/format1.c | 2 +- lib/format_pool/format_pool.c | 2 +- lib/format_text/format-text.c | 6 +++--- lib/format_text/text_label.c | 2 +- lib/metadata/metadata.c | 6 +++--- lib/metadata/metadata.h | 2 +- 7 files changed, 11 insertions(+), 10 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index a600f1da1..0b5befc21 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.75 - ===================================== + Rename 'flags' to 'status' in struct metadata_area. Avoid segfault by limiting partial mode for lvm1 metadata. (2.02.74) Add dm_zalloc and use it and dm_pool_zalloc throughout. Add pv_get_property and create generic internal _get_property function. diff --git a/lib/format1/format1.c b/lib/format1/format1.c index f5a9d12b2..0dcec053d 100644 --- a/lib/format1/format1.c +++ b/lib/format1/format1.c @@ -545,7 +545,7 @@ static struct format_instance *_format1_create_instance(const struct format_type mda->ops = &_metadata_format1_ops; mda->metadata_locn = NULL; - mda->flags = 0; + mda->status = 0; dm_list_add(&fid->metadata_areas_in_use, &mda->list); return fid; diff --git a/lib/format_pool/format_pool.c b/lib/format_pool/format_pool.c index 56626f5bf..04b561165 100644 --- a/lib/format_pool/format_pool.c +++ b/lib/format_pool/format_pool.c @@ -276,7 +276,7 @@ static struct format_instance *_pool_create_instance(const struct format_type *f mda->ops = &_metadata_format_pool_ops; mda->metadata_locn = NULL; - mda->flags = 0; + mda->status = 0; dm_list_add(&fid->metadata_areas_in_use, &mda->list); return fid; diff --git a/lib/format_text/format-text.c b/lib/format_text/format-text.c index e60df5023..eee01147b 100644 --- a/lib/format_text/format-text.c +++ b/lib/format_text/format-text.c @@ -1947,7 +1947,7 @@ static struct format_instance *_text_create_text_instance(const struct format_ty return_NULL; mda->ops = &_metadata_text_file_backup_ops; mda->metadata_locn = context; - mda->flags = 0; + mda->status = 0; fid_add_mda(fid, mda); } else { dir_list = &((struct mda_lists *) fmt->private)->dirs; @@ -1965,7 +1965,7 @@ static struct format_instance *_text_create_text_instance(const struct format_ty return_NULL; mda->ops = &_metadata_text_file_ops; mda->metadata_locn = context; - mda->flags = 0; + mda->status = 0; fid_add_mda(fid, mda); } @@ -1985,7 +1985,7 @@ static struct format_instance *_text_create_text_instance(const struct format_ty /* FIXME Allow multiple dev_areas inside area */ memcpy(&mdac->area, &rl->dev_area, sizeof(mdac->area)); mda->ops = &_metadata_text_raw_ops; - mda->flags = 0; + mda->status = 0; /* FIXME MISTAKE? mda->metadata_locn = context; */ fid_add_mda(fid, mda); } diff --git a/lib/format_text/text_label.c b/lib/format_text/text_label.c index 6323705cf..e459cdef4 100644 --- a/lib/format_text/text_label.c +++ b/lib/format_text/text_label.c @@ -216,7 +216,7 @@ int add_mda(const struct format_type *fmt, struct dm_pool *mem, struct dm_list * mdal->ops = mda_lists->raw_ops; mdal->metadata_locn = mdac; - mdal->flags = 0; + mdal->status = 0; mdac->area.dev = dev; mdac->area.start = start; diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c index 3d30b66c5..a073e82ca 100644 --- a/lib/metadata/metadata.c +++ b/lib/metadata/metadata.c @@ -3839,7 +3839,7 @@ unsigned mda_locns_match(struct metadata_area *mda1, struct metadata_area *mda2) unsigned mda_is_ignored(struct metadata_area *mda) { - return (mda->flags & MDA_IGNORED); + return (mda->status & MDA_IGNORED); } void mda_set_ignored(struct metadata_area *mda, unsigned mda_ignored) @@ -3848,9 +3848,9 @@ void mda_set_ignored(struct metadata_area *mda, unsigned mda_ignored) unsigned old_mda_ignored = mda_is_ignored(mda); if (mda_ignored && !old_mda_ignored) - mda->flags |= MDA_IGNORED; + mda->status |= MDA_IGNORED; else if (!mda_ignored && old_mda_ignored) - mda->flags &= ~MDA_IGNORED; + mda->status &= ~MDA_IGNORED; else return; /* No change */ diff --git a/lib/metadata/metadata.h b/lib/metadata/metadata.h index a4a82514f..8e950a9d3 100644 --- a/lib/metadata/metadata.h +++ b/lib/metadata/metadata.h @@ -182,7 +182,7 @@ struct metadata_area { struct dm_list list; struct metadata_area_ops *ops; void *metadata_locn; - uint32_t flags; + uint32_t status; }; struct metadata_area *mda_copy(struct dm_pool *mem, struct metadata_area *mda); -- 2.43.5