public inbox for lvm2-cvs@sourceware.org help / color / mirror / Atom feed
From: mbroz@sourceware.org To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org Subject: LVM2/lib/metadata mirror.c Date: Wed, 09 Dec 2009 19:43:00 -0000 [thread overview] Message-ID: <20091209194339.28299.qmail@sourceware.org> (raw) CVSROOT: /cvs/lvm2 Module name: LVM2 Changes by: mbroz@sourceware.org 2009-12-09 19:43:39 Modified files: lib/metadata : mirror.c Log message: Use more descriptive variable name for temporary layer lv. Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/metadata/mirror.c.diff?cvsroot=lvm2&r1=1.97&r2=1.98 --- LVM2/lib/metadata/mirror.c 2009/12/09 18:09:52 1.97 +++ LVM2/lib/metadata/mirror.c 2009/12/09 19:43:39 1.98 @@ -502,7 +502,7 @@ uint32_t s; struct logical_volume *sub_lv; struct logical_volume *detached_log_lv = NULL; - struct logical_volume *lv1 = NULL; + struct logical_volume *temp_layer_lv = NULL; struct lv_segment *mirrored_seg = first_seg(lv); uint32_t old_area_count = mirrored_seg->area_count; uint32_t new_area_count = mirrored_seg->area_count; @@ -561,11 +561,11 @@ * leave the LV as mirrored and let the lvconvert completion * to remove the layer. */ if (new_area_count == 1 && !is_temporary_mirror_layer(lv)) { - lv1 = seg_lv(mirrored_seg, 0); - lv1->status &= ~MIRROR_IMAGE; - lv_set_visible(lv1); + temp_layer_lv = seg_lv(mirrored_seg, 0); + temp_layer_lv->status &= ~MIRROR_IMAGE; + lv_set_visible(temp_layer_lv); detached_log_lv = detach_mirror_log(mirrored_seg); - if (!remove_layer_from_lv(lv, lv1)) + if (!remove_layer_from_lv(lv, temp_layer_lv)) return_0; lv->status &= ~MIRRORED; lv->status &= ~MIRROR_NOTSYNCED; @@ -616,9 +616,9 @@ * As it's now detached from mirrored_seg->lv we must resume it * explicitly. */ - if (lv1) { - if (!resume_lv(lv1->vg->cmd, lv1)) { - log_error("Problem resuming temporary LV, %s", lv1->name); + if (temp_layer_lv) { + if (!resume_lv(temp_layer_lv->vg->cmd, temp_layer_lv)) { + log_error("Problem resuming temporary LV, %s", temp_layer_lv->name); return 0; } @@ -647,7 +647,7 @@ return_0; } - if (lv1 && !_delete_lv(lv, lv1)) + if (temp_layer_lv && !_delete_lv(lv, temp_layer_lv)) return_0; if (detached_log_lv && !_delete_lv(lv, detached_log_lv))
next reply other threads:[~2009-12-09 19:43 UTC|newest] Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top 2009-12-09 19:43 mbroz [this message] -- strict thread matches above, loose matches on Subject: below -- 2012-02-01 15:05 agk 2011-09-19 14:28 jbrassow 2011-09-16 16:41 jbrassow 2011-09-14 9:54 zkabelac 2011-09-14 4:10 jbrassow 2011-09-13 18:11 jbrassow 2011-06-24 23:39 agk 2011-04-12 14:13 zkabelac 2011-03-24 12:28 mornfall 2011-01-11 17:21 jbrassow 2010-07-09 17:57 jbrassow 2010-06-23 13:57 jbrassow 2010-04-20 12:14 agk 2010-04-01 14:54 agk 2010-01-08 10:50 zkabelac 2009-12-17 15:59 mornfall 2009-11-19 13:42 mornfall 2009-11-19 12:09 mornfall 2009-11-18 18:23 mornfall 2009-10-14 14:55 jbrassow 2009-04-23 16:43 mornfall 2008-09-19 4:30 agk 2008-09-19 0:20 agk 2008-01-17 13:37 agk 2008-01-16 19:50 agk 2008-01-16 19:38 agk 2008-01-16 19:11 agk 2008-01-16 19:09 agk 2006-11-10 20:15 agk 2004-05-05 18:35 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=20091209194339.28299.qmail@sourceware.org \ --to=mbroz@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).