public inbox for lvm2-cvs@sourceware.org help / color / mirror / Atom feed
From: agk@sourceware.org To: lvm2-cvs@sourceware.org Subject: LVM2/lib/metadata lv_manip.c Date: Sat, 07 Oct 2006 16:00:00 -0000 [thread overview] Message-ID: <20061007160029.30686.qmail@sourceware.org> (raw) CVSROOT: /cvs/lvm2 Module name: LVM2 Changes by: agk@sourceware.org 2006-10-07 16:00:29 Modified files: lib/metadata : lv_manip.c Log message: more refactoring Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/metadata/lv_manip.c.diff?cvsroot=lvm2&r1=1.107&r2=1.108 --- LVM2/lib/metadata/lv_manip.c 2006/10/07 12:41:06 1.107 +++ LVM2/lib/metadata/lv_manip.c 2006/10/07 16:00:28 1.108 @@ -681,7 +681,7 @@ struct lv_segment *seg; uint32_t s; uint32_t remaining_seg_len, area_len, area_multiple; - int r; + int r = 1; if (!(seg = find_seg_by_le(lv, le))) { log_error("Failed to find segment for %s extent %" PRIu32, @@ -712,7 +712,6 @@ } else if (seg_type(seg, s) == AREA_PV) if (!(r = fn(cmd, seg_pvseg(seg, s), data))) stack; - if (r != 1) return r; } @@ -758,36 +757,50 @@ return 1; } +static int _check_pv_contiguous(struct logical_volume *prev_lv, uint32_t prev_le, struct pv_area *pva, + struct pv_area **areas, uint32_t areas_size) +{ + struct lv_segment *seg; + uint32_t s; + int r; + + if (!(seg = find_seg_by_le(prev_lv, prev_le))) { + log_error("Failed to find segment for %s extent %" PRIu32, + prev_lv->name, prev_le); + return 0; + } + + for (s = 0; s < seg->area_count && s < areas_size; s++) { + if (seg_type(seg, s) == AREA_LV) { + /* FIXME For more areas supply flattened seg to ensure consistency */ + if (seg->area_count == 1) { + if (!(r = _check_pv_contiguous(seg->lv, seg->le + seg->len - 1, pva, &areas[s], 1))) + stack; + if (r != 1) + return r; + } + } else if (seg_type(seg, s) == AREA_PV) + if (_is_contiguous(seg_pvseg(seg, s), pva)) { + areas[s] = pva; + return 2; /* Finished */ + } + } + + return 1; /* Continue search */ +} + /* * Is pva contiguous to any existing areas or on the same PV? */ static int _check_contiguous(struct lv_segment *prev_lvseg, struct pv_area *pva, struct pv_area **areas, uint32_t areas_size) { - struct pv_segment *prev_pvseg; - struct lv_segment *lastseg; - uint32_t s; - - for (s = 0; s < prev_lvseg->area_count && s < areas_size; s++) { - if (seg_type(prev_lvseg, s) == AREA_LV) { - lastseg = list_item(list_last(&seg_lv(prev_lvseg, s)->segments), struct lv_segment); - /* FIXME For more areas supply flattened prev_lvseg to ensure consistency */ - if (lastseg->area_count == 1 && - _check_contiguous(lastseg, pva, &areas[s], 1)) - return 1; - continue; - } - - if (!(prev_pvseg = seg_pvseg(prev_lvseg, s))) - continue; /* FIXME Broken */ + int r; - if (_is_contiguous(prev_pvseg, pva)) { - areas[s] = pva; - return 1; - } - } + if (!(r = _check_pv_contiguous(prev_lvseg->lv, prev_lvseg->le + prev_lvseg->len - 1, pva, areas, areas_size))) + stack; - return 0; + return r ? 1 : 0; } /*
next reply other threads:[~2006-10-07 16:00 UTC|newest] Thread overview: 79+ messages / expand[flat|nested] mbox.gz Atom feed top 2006-10-07 16:00 agk [this message] -- strict thread matches above, loose matches on Subject: below -- 2012-05-11 15:32 agk 2012-05-11 15:26 agk 2012-03-04 15:57 zkabelac 2012-03-01 10:09 zkabelac 2012-02-28 10:08 zkabelac 2012-02-12 21:37 agk 2012-02-01 2:11 agk 2012-01-26 21:39 zkabelac 2012-01-25 11:27 zkabelac 2012-01-25 9:15 zkabelac 2012-01-25 9:14 zkabelac 2012-01-25 9:02 zkabelac 2012-01-25 8:57 zkabelac 2012-01-24 14:54 agk 2012-01-24 14:15 mbroz 2012-01-19 15:39 zkabelac 2011-11-15 17:29 zkabelac 2011-11-15 17:23 zkabelac 2011-11-12 22:53 zkabelac 2011-11-12 22:52 zkabelac 2011-11-12 22:51 zkabelac 2011-11-10 12:42 zkabelac 2011-11-10 12:42 zkabelac 2011-11-10 12:39 zkabelac 2011-11-07 13:54 agk 2011-11-04 22:45 zkabelac 2011-11-03 15:46 zkabelac 2011-11-03 14:56 zkabelac 2011-10-30 22:02 zkabelac 2011-10-28 20:29 zkabelac 2011-10-28 20:18 zkabelac 2011-10-22 16:49 zkabelac 2011-10-22 16:46 zkabelac 2011-10-21 9:55 zkabelac 2011-10-20 10:35 zkabelac 2011-10-03 18:43 zkabelac 2011-09-16 18:39 jbrassow 2011-09-16 12:12 zkabelac 2011-09-16 11:59 zkabelac 2011-09-06 15:39 agk 2011-08-19 22:55 agk 2011-08-19 16:41 agk 2011-08-10 16:44 jbrassow 2011-08-05 9:21 prajnoha 2011-06-06 12:08 agk 2011-03-25 22:02 jbrassow 2010-04-08 0:56 agk 2010-04-08 0:52 agk 2010-04-02 1:35 agk 2010-04-01 13:58 agk 2010-04-01 12:29 agk 2010-03-31 20:26 agk 2010-02-17 23:36 snitzer 2010-01-20 21:53 snitzer 2010-01-14 10:17 zkabelac 2010-01-14 10:09 zkabelac 2010-01-14 10:08 zkabelac 2010-01-13 1:52 snitzer 2010-01-13 1:51 snitzer 2010-01-10 20:44 snitzer 2010-01-08 23:06 jbrassow 2009-06-06 16:37 mbroz 2009-06-01 14:23 mbroz 2009-01-06 17:24 mbroz 2008-01-16 20:00 agk 2007-11-04 16:28 agk 2007-08-08 18:00 wysochanski 2007-08-07 18:55 wysochanski 2007-08-07 16:57 wysochanski 2007-08-06 20:35 wysochanski 2006-10-07 11:34 agk 2006-10-07 11:23 agk 2006-04-27 17:58 agk 2005-11-24 21:23 agk 2005-11-24 18:00 agk 2005-10-27 22:20 agk 2005-06-03 15:44 agk 2004-03-19 16:19 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=20061007160029.30686.qmail@sourceware.org \ --to=agk@sourceware.org \ --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).