Detect case of both merging_store and cow_store supplied in

_snap_text_import().

diff --git a/lib/snapshot/snapshot.c b/lib/snapshot/snapshot.c
index d1dd1223fb5a4c03a8384097504093692d0893b6..0a8212aaca6f088234b2d57867395d1c31041064 100644 (file)
--- a/lib/snapshot/snapshot.c
+++ b/lib/snapshot/snapshot.c
@@ -46,9 +46,14 @@ static int _snap_text_import(struct lv_segment *seg, const struct config_node *s
 
        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.");