public inbox for lvm2-cvs@sourceware.org help / color / mirror / Atom feed
From: wysochanski@sourceware.org To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org Subject: LVM2 ./WHATS_NEW lib/metadata/metadata.c Date: Fri, 12 Oct 2007 18:37:00 -0000 [thread overview] Message-ID: <20071012183720.31244.qmail@sourceware.org> (raw) CVSROOT: /cvs/lvm2 Module name: LVM2 Changes by: wysochanski@sourceware.org 2007-10-12 18:37:19 Modified files: . : WHATS_NEW lib/metadata : metadata.c Log message: Add _alloc_pv() and _free_pv() from _pv_create() code and fix error paths. Modified original patch by Jun'ichi Nomura <j-nomura@ce.jp.nec.com> Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/WHATS_NEW.diff?cvsroot=lvm2&r1=1.720&r2=1.721 http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/metadata/metadata.c.diff?cvsroot=lvm2&r1=1.138&r2=1.139 --- LVM2/WHATS_NEW 2007/10/12 14:29:31 1.720 +++ LVM2/WHATS_NEW 2007/10/12 18:37:19 1.721 @@ -1,8 +1,9 @@ Version 2.02.29 - ================================== + Add _alloc_pv() and _free_pv() from _pv_create() code and fix error paths. Add pv_dev_name() to access PV device name. Add const attributes to pv accessor functions. - Refactor vg_add_snapshot and lv_create_empty. + Refactor vg_add_snapshot() and lv_create_empty(). Handle new sysfs subsystem/block/devices directory structure. Tests are run with LVM_SYSTEM_DIR pointing to private root and /dev dirs. Fix a bug in lvm_dump.sh checks for lvm/dmsetup binaries. --- LVM2/lib/metadata/metadata.c 2007/10/12 14:29:32 1.138 +++ LVM2/lib/metadata/metadata.c 2007/10/12 18:37:19 1.139 @@ -708,6 +708,45 @@ pvmetadatasize, mdas); } +static void _free_pv(struct dm_pool *mem, struct physical_volume *pv) +{ + /* + * FIXME: leak pv->vg_name + * Adding dm_pool_free(mem, pv->vg_name) - causes warning w/'const' + * Perhaps pv->vg_name should be initialized to ORPHAN, not alloc'd + * memory? + */ + dm_pool_free(mem, pv); +} + +static struct physical_volume *_alloc_pv(struct dm_pool *mem) +{ + struct physical_volume *pv = dm_pool_zalloc(mem, sizeof(*pv)); + + if (!pv) { + stack; + return NULL; + } + + if (!(pv->vg_name = dm_pool_zalloc(mem, NAME_LEN))) { + dm_pool_free(mem, pv); + return NULL; + } + + pv->pe_size = 0; + pv->pe_start = 0; + pv->pe_count = 0; + pv->pe_alloc_count = 0; + pv->fmt = NULL; + + pv->status = ALLOCATABLE_PV; + + list_init(&pv->tags); + list_init(&pv->segments); + + return pv; +} + /* Sizes in sectors */ static struct physical_volume *_pv_create(const struct format_type *fmt, struct device *dev, @@ -719,28 +758,21 @@ uint64_t pvmetadatasize, struct list *mdas) { struct dm_pool *mem = fmt->cmd->mem; - struct physical_volume *pv = dm_pool_zalloc(mem, sizeof(*pv)); + struct physical_volume *pv = _alloc_pv(mem); - if (!pv) { - stack; + if (!pv) return NULL; - } if (id) memcpy(&pv->id, id, sizeof(*id)); else if (!id_create(&pv->id)) { log_error("Failed to create random uuid for %s.", dev_name(dev)); - return NULL; + goto bad; } pv->dev = dev; - if (!(pv->vg_name = dm_pool_zalloc(mem, NAME_LEN))) - goto_bad; - - pv->status = ALLOCATABLE_PV; - if (!dev_get_size(pv->dev, &pv->size)) { log_error("%s: Couldn't get size.", pv_dev_name(pv)); goto bad; @@ -761,15 +793,8 @@ goto bad; } - pv->pe_size = 0; - pv->pe_start = 0; - pv->pe_count = 0; - pv->pe_alloc_count = 0; pv->fmt = fmt; - list_init(&pv->tags); - list_init(&pv->segments); - if (!fmt->ops->pv_setup(fmt, pe_start, existing_extent_count, existing_extent_size, pvmetadatacopies, pvmetadatasize, mdas, @@ -781,7 +806,7 @@ return pv; bad: - dm_pool_free(mem, pv); + _free_pv(mem, pv); return NULL; }
next reply other threads:[~2007-10-12 18:37 UTC|newest] Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top 2007-10-12 18:37 wysochanski [this message] -- strict thread matches above, loose matches on Subject: below -- 2012-03-12 14:18 zkabelac 2012-02-23 0:11 agk 2012-02-13 11:01 zkabelac 2012-02-13 10:58 zkabelac 2012-02-13 10:51 zkabelac 2011-11-18 19:28 zkabelac 2011-10-24 10:24 zkabelac 2011-08-11 16:31 prajnoha 2011-08-04 15:18 zkabelac 2011-03-29 21:57 zkabelac 2011-03-11 15:06 prajnoha 2011-03-10 13:12 zkabelac 2010-12-08 10:45 zkabelac 2010-11-29 11:08 zkabelac 2010-08-19 23:03 mbroz 2010-06-22 21:10 mbroz 2010-05-21 12:45 zkabelac 2010-04-01 11:43 agk 2010-03-02 21:56 snitzer 2010-01-21 21:09 wysochanski 2010-01-05 16:01 mbroz 2009-12-18 12:45 mbroz 2009-12-18 12:44 mbroz 2009-12-11 13:14 zkabelac 2009-12-09 19:29 mbroz 2009-08-20 7:03 mbroz 2009-07-16 3:25 wysochanski 2009-05-27 13:19 agk 2009-05-12 19:09 mbroz 2009-04-22 9:31 mbroz 2009-04-10 9:56 mbroz 2009-01-26 22:43 agk 2008-09-25 15:59 mbroz 2008-06-03 17:56 agk 2008-05-08 18:06 agk 2008-04-07 22:12 agk 2008-04-04 15:41 wysochanski 2007-07-02 21:48 wysochanski 2006-09-21 20:25 agk 2006-08-09 19:33 agk 2006-07-04 19:36 agk
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20071012183720.31244.qmail@sourceware.org \ --to=wysochanski@sourceware.org \ --cc=lvm-devel@redhat.com \ --cc=lvm2-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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).