public inbox for lvm2-cvs@sourceware.org
help / color / mirror / Atom feed
From: agk@sourceware.org
To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org
Subject: LVM2/lib/activate dev_manager.c
Date: Tue, 05 Jul 2011 01:01:00 -0000	[thread overview]
Message-ID: <20110705010120.26576.qmail@sourceware.org> (raw)

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	agk@sourceware.org	2011-07-05 01:01:19

Modified files:
	lib/activate   : dev_manager.c 

Log message:
	Fix conditions using no_merging: only those using lv_is_merging_cow() should
	have been converted, not pure lv_is_cow ones.
	(Merging has no impact on how the pre-merged cow segment itself is loaded.)

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/activate/dev_manager.c.diff?cvsroot=lvm2&r1=1.223&r2=1.224

--- LVM2/lib/activate/dev_manager.c	2011/07/04 14:56:58	1.223
+++ LVM2/lib/activate/dev_manager.c	2011/07/05 01:01:19	1.224
@@ -1436,7 +1436,7 @@
 		}
 		if (!_add_new_lv_to_dtree(dm, dtree, seg->lv, laopts, "real"))
 			return_0;
-	} else if (!laopts->no_merging && lv_is_cow(seg->lv) && !layer) {
+	} else if (lv_is_cow(seg->lv) && !layer) {
 		if (!_add_new_lv_to_dtree(dm, dtree, seg->lv, laopts, "cow"))
 			return_0;
 	} else {
@@ -1457,7 +1457,7 @@
 			if (!_add_snapshot_merge_target_to_dtree(dm, dnode, seg->lv))
 				return_0;
 		}
-	} else if (!laopts->no_merging && lv_is_cow(seg->lv) && !layer) {
+	} else if (lv_is_cow(seg->lv) && !layer) {
 		if (!_add_snapshot_target_to_dtree(dm, dnode, seg->lv, laopts))
 			return_0;
 	} else if (!_add_target_to_dtree(dm, dnode, seg, laopts))


             reply	other threads:[~2011-07-05  1:01 UTC|newest]

Thread overview: 46+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-07-05  1:01 agk [this message]
  -- strict thread matches above, loose matches on Subject: below --
2012-02-13 17:59 jbrassow
2012-01-25 11:10 agk
2012-01-19 15:19 zkabelac
2011-12-21 12:55 zkabelac
2011-11-15 17:25 zkabelac
2011-11-15 17:21 zkabelac
2011-11-15 17:15 zkabelac
2011-10-28 20:34 zkabelac
2011-10-11 10:02 zkabelac
2011-10-11  9:03 zkabelac
2011-10-11  9:02 zkabelac
2011-10-11  9:01 zkabelac
2011-10-11  8:54 zkabelac
2011-10-03 18:24 zkabelac
2011-07-04 14:56 agk
2010-12-22 15:32 zkabelac
2010-12-20 14:04 zkabelac
2010-05-14 12:39 mbroz
2010-05-14 12:30 mbroz
2010-05-14 12:03 mbroz
2010-02-23 15:49 mornfall
2010-02-10 14:38 snitzer
2010-01-22 13:28 snitzer
2010-01-13  1:44 snitzer
2009-12-03 10:01 zkabelac
2009-12-03  9:59 zkabelac
2009-11-04 14:56 mbroz
2009-05-07 12:01 mbroz
2008-09-19  7:05 agk
2008-01-08 16:47 zkabelac
2007-12-03 18:00 agk
2007-11-29 15:04 agk
2005-11-22 19:37 agk
2005-11-09 23:56 agk
2005-11-09 18:12 agk
2005-11-09 13:08 agk
2005-10-26 19:50 agk
2005-10-26 17:56 agk
2005-10-26 17:31 agk
2005-10-26 15:54 agk
2005-10-26 15:00 agk
2005-10-26 14:13 agk
2005-10-17 19:06 agk
2005-08-04  1:29 agk
2004-05-12 20:40 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=20110705010120.26576.qmail@sourceware.org \
    --to=agk@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: link
Be 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).