public inbox for lvm2-cvs@sourceware.org
help / color / mirror / Atom feed
* LVM2/lib/snapshot snapshot.c
@ 2010-01-15 17:46 snitzer
0 siblings, 0 replies; 2+ messages in thread
From: snitzer @ 2010-01-15 17:46 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
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.");
^ permalink raw reply [flat|nested] 2+ messages in thread
* LVM2/lib/snapshot snapshot.c
@ 2008-01-11 17:44 wysochanski
0 siblings, 0 replies; 2+ messages in thread
From: wysochanski @ 2008-01-11 17:44 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: wysochanski@sourceware.org 2008-01-11 17:44:26
Modified files:
lib/snapshot : snapshot.c
Log message:
Fix warning on conditional compile, unused variable
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/snapshot/snapshot.c.diff?cvsroot=lvm2&r1=1.25&r2=1.26
--- LVM2/lib/snapshot/snapshot.c 2008/01/09 15:32:19 1.25
+++ LVM2/lib/snapshot/snapshot.c 2008/01/11 17:44:26 1.26
@@ -300,7 +300,9 @@
#endif
{
struct segment_type *segtype = dm_malloc(sizeof(*segtype));
+#ifdef DMEVENTD
char *dso;
+#endif
if (!segtype) {
stack;
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-01-15 17:46 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-01-15 17:46 LVM2/lib/snapshot snapshot.c snitzer
-- strict thread matches above, loose matches on Subject: below --
2008-01-11 17:44 wysochanski
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).