Remove unused internal non-persistent snapshot option.

diff --git a/WHATS_NEW b/WHATS_NEW
index e6eb9e40c6d00dc20218e0e3aa7f2699750da6e1..090eb3d7d08bef6fb73c16cec48cdeb232ad6826 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,6 +1,7 @@
 Version 2.01.10 - 
 ================================
   Internal snapshot restructuring.
+  Remove unused internal non-persistent snapshot option.
   Allow offline extension of snapshot volumes.
   Move from 2-step to 3-step on-disk metadata commit.
   Scan ramdisks too and allow non-O_DIRECT fallback.

diff --git a/lib/format1/import-export.c b/lib/format1/import-export.c
index 335b729fed47d51327dc091196f2fba1bd7b47f3..99bddd26568122888c7fc5ff334660fc51308f04 100644 (file)
--- a/lib/format1/import-export.c
+++ b/lib/format1/import-export.c
@@ -646,7 +646,7 @@ int import_snapshots(struct pool *mem, struct volume_group *vg,
                                continue;
 
                        /* insert the snapshot */
-                       if (!vg_add_snapshot(org, cow, 1, NULL, org->le_count, 
+                       if (!vg_add_snapshot(org, cow, NULL, org->le_count, 
                                             lvd->lv_chunk_size)) {
                                log_err("Couldn't add snapshot.");
                                return 0;

diff --git a/lib/metadata/metadata.h b/lib/metadata/metadata.h
index 94b7d085c722e49c4da13e7313b1b75b7fd7c5be..154f00ddcb7116f656a9a18828485b0dc655804c 100644 (file)
--- a/lib/metadata/metadata.h
+++ b/lib/metadata/metadata.h
@@ -260,7 +260,6 @@ struct logical_volume {
 struct snapshot {
        union lvid lvid;
 
-       int persistent;         /* boolean */
        uint32_t chunk_size;    /* in 512 byte sectors */
        uint32_t le_count;
 
@@ -508,7 +507,7 @@ struct snapshot *find_origin(const struct logical_volume *lv);
 struct list *find_snapshots(const struct logical_volume *lv);
 
 int vg_add_snapshot(struct logical_volume *origin, struct logical_volume *cow,
-                   int persistent, union lvid *lvid, uint32_t extent_count,
+                   union lvid *lvid, uint32_t extent_count,
                    uint32_t chunk_size);
 
 int vg_remove_snapshot(struct volume_group *vg, struct logical_volume *cow);

diff --git a/lib/metadata/snapshot_manip.c b/lib/metadata/snapshot_manip.c
index 71782a277b15e62882caef3f7d700e2bf1cfad35..cd9ebfbaef32d079d5371f51055f2b1139ca36de 100644 (file)
--- a/lib/metadata/snapshot_manip.c
+++ b/lib/metadata/snapshot_manip.c
@@ -105,7 +105,7 @@ struct list *find_snapshots(const struct logical_volume *lv)
 }
 
 int vg_add_snapshot(struct logical_volume *origin, struct logical_volume *cow,
-                   int persistent, union lvid *lvid, uint32_t extent_count,
+                   union lvid *lvid, uint32_t extent_count,
                    uint32_t chunk_size)
 {
        struct snapshot *s;
@@ -125,7 +125,6 @@ int vg_add_snapshot(struct logical_volume *origin, struct logical_volume *cow,
                return 0;
        }
 
-       s->persistent = persistent;
        s->chunk_size = chunk_size;
        s->le_count = extent_count;
        s->origin = origin;

diff --git a/lib/snapshot/snapshot.c b/lib/snapshot/snapshot.c
index 153ee47d445cd86f3a530ea6fe0d956e819b0c0d..65b73c10fc26346b32cdd075996bb79bc30f901d 100644 (file)
--- a/lib/snapshot/snapshot.c
+++ b/lib/snapshot/snapshot.c
@@ -70,7 +70,7 @@ static int _text_import(struct lv_segment *seg, const struct config_node *sn,
                return 0;
        }
 
-       if (!vg_add_snapshot(org, cow, 1, &seg->lv->lvid, seg->len,
+       if (!vg_add_snapshot(org, cow, &seg->lv->lvid, seg->len,
                             chunk_size)) {
                stack;
                return 0;

diff --git a/tools/lvcreate.c b/tools/lvcreate.c
index ac868fe484651c1ae55e40b74e3132559acabd42..d9e0a65867397388eb2be2a1e84ceb5d9969b887 100644 (file)
--- a/tools/lvcreate.c
+++ b/tools/lvcreate.c
@@ -609,7 +609,7 @@ static int _lvcreate(struct cmd_context *cmd, struct lvcreate_params *lp)
                        return 0;
                }
 
-               if (!vg_add_snapshot(org, lv, 1, NULL, org->le_count,
+               if (!vg_add_snapshot(org, lv, NULL, org->le_count,
                                     lp->chunk_size)) {
                        log_err("Couldn't create snapshot.");
                        return 0;