---
 lib/metadata/metadata-exported.h |    2 +-
 lib/metadata/snapshot_manip.c    |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

Index: LVM2.2.02.45/lib/metadata/metadata-exported.h
===================================================================
--- LVM2.2.02.45.orig/lib/metadata/metadata-exported.h	2009-05-19 21:17:44.000000000 +0200
+++ LVM2.2.02.45/lib/metadata/metadata-exported.h	2009-05-19 21:18:46.000000000 +0200
@@ -552,7 +552,7 @@ struct logical_volume *origin_from_cow(c
 int vg_add_snapshot(const char *name,
 		    struct logical_volume *origin, struct logical_volume *cow,
 		    union lvid *lvid, uint32_t extent_count,
-		    uint32_t chunk_size, uint32_t merge_flags);
+		    uint32_t chunk_size, uint32_t snapshot_flags);
 
 int vg_remove_snapshot(struct logical_volume *cow);
 
Index: LVM2.2.02.45/lib/metadata/snapshot_manip.c
===================================================================
--- LVM2.2.02.45.orig/lib/metadata/snapshot_manip.c	2009-05-19 21:17:44.000000000 +0200
+++ LVM2.2.02.45/lib/metadata/snapshot_manip.c	2009-05-19 21:18:46.000000000 +0200
@@ -59,7 +59,7 @@ struct logical_volume *origin_from_cow(c
 int vg_add_snapshot(const char *name, struct logical_volume *origin,
 		    struct logical_volume *cow, union lvid *lvid,
 		    uint32_t extent_count, uint32_t chunk_size,
-		    uint32_t merge_flags)
+		    uint32_t snapshot_flags)
 {
 	struct logical_volume *snap;
 	struct lv_segment *seg;
@@ -96,11 +96,11 @@ int vg_add_snapshot(const char *name, st
 	seg->origin = origin;
 	seg->cow = cow;
 	seg->lv->status |= SNAPSHOT;
-	if (merge_flags & SNAPSHOT_MERGE) {
+	if (snapshot_flags & SNAPSHOT_MERGE) {
 		seg->status |= SNAPSHOT_MERGE;
 		origin->merging_snapshot = seg;
 	}
-	if (merge_flags & SNAPSHOT_MERGE_ON_ACT)
+	if (snapshot_flags & SNAPSHOT_MERGE_ON_ACT)
 		seg->status |= SNAPSHOT_MERGE_ON_ACT;
 
 	origin->origin_count++;