Remove --no-resume.

[dss.git] / dss.c

diff --git a/dss.c b/dss.c
index 03ddaf89c1493c10bef79e7c0f36c9180d2410e5..9417e260fcabf40386d13ac9b4742dc1dbfc9aba 100644 (file)
--- a/dss.c
+++ b/dss.c
@@ -1124,8 +1124,6 @@ static int rename_resume_snap(int64_t creation_time)
        sl.num_snapshots = 0;
 
        ret = 0;
-       if (conf.no_resume_given)
-               goto out;
        dss_get_snapshot_list(&sl);
        /*
         * Snapshot recycling: We first look at the newest snapshot. If this
@@ -1157,11 +1155,11 @@ static int rename_resume_snap(int64_t creation_time)
        s = find_orphaned_snapshot(&sl);
 out:
        if (s) {
-               DSS_INFO_LOG(("reusing %s snapshot %s\n", why, s->name));
+               DSS_NOTICE_LOG(("recycling %s snapshot %s\n", why, s->name));
                ret = dss_rename(s->name, new_name);
        }
        if (ret >= 0)
-               DSS_NOTICE_LOG(("creating new snapshot %s\n", new_name));
+               DSS_NOTICE_LOG(("creating %s\n", new_name));
        free(new_name);
        free_snapshot_list(&sl);
        return ret;
@@ -1516,7 +1514,6 @@ int main(int argc, char **argv)
                 * Parse the command line options again, but this time check
                 * that all required options are given.
                 */
-               struct cmdline_parser_params params;
                params.override = 1;
                params.initialize = 1;
                params.check_required = 1;