public inbox for lvm2-cvs@sourceware.org
help / color / mirror / Atom feed
From: snitzer@sourceware.org
To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org
Subject: LVM2/lib/snapshot snapshot.c
Date: Fri, 15 Jan 2010 17:46:00 -0000 [thread overview]
Message-ID: <20100115174608.29126.qmail@sourceware.org> (raw)
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: snitzer@sourceware.org 2010-01-15 17:46:08
Modified files:
lib/snapshot : snapshot.c
Log message:
Detect case of both merging_store and cow_store supplied in
_snap_text_import().
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/snapshot/snapshot.c.diff?cvsroot=lvm2&r1=1.44&r2=1.45
--- LVM2/lib/snapshot/snapshot.c 2010/01/15 16:35:26 1.44
+++ LVM2/lib/snapshot/snapshot.c 2010/01/15 17:46:08 1.45
@@ -46,9 +46,14 @@
old_suppress = log_suppress(1);
- /* FIXME Detect case of both merging_store and cow_store supplied */
- if ((cow_name = find_config_str(sn, "merging_store", NULL)))
+ if ((cow_name = find_config_str(sn, "merging_store", NULL))) {
+ if (find_config_str(sn, "cow_store", NULL)) {
+ log_suppress(old_suppress);
+ log_error("Both snapshot cow and merging storage were specified.");
+ return 0;
+ }
merge = 1;
+ }
else if (!(cow_name = find_config_str(sn, "cow_store", NULL))) {
log_suppress(old_suppress);
log_error("Snapshot cow storage not specified.");
next reply other threads:[~2010-01-15 17:46 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-15 17:46 snitzer [this message]
-- strict thread matches above, loose matches on Subject: below --
2008-01-11 17:44 wysochanski
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=20100115174608.29126.qmail@sourceware.org \
--to=snitzer@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).