Skip NULL check before dm_free

dm_free checks for NULL itself.

diff --git a/lib/format_text/archiver.c b/lib/format_text/archiver.c
index e0212a216ad80aacc9d168b940a0bdb7e2eb9b97..2d47ff5e887a8f7f6a03ad27fabe0e9c3803739c 100644 (file)
--- a/lib/format_text/archiver.c
+++ b/lib/format_text/archiver.c
@@ -69,8 +69,7 @@ void archive_exit(struct cmd_context *cmd)
 {
        if (!cmd->archive_params)
                return;
-       if (cmd->archive_params->dir)
-               dm_free(cmd->archive_params->dir);
+       dm_free(cmd->archive_params->dir);
        memset(cmd->archive_params, 0, sizeof(*cmd->archive_params));
 }
 
@@ -183,8 +182,7 @@ void backup_exit(struct cmd_context *cmd)
 {
        if (!cmd->backup_params)
                return;
-       if (cmd->backup_params->dir)
-               dm_free(cmd->backup_params->dir);
+       dm_free(cmd->backup_params->dir);
        memset(cmd->backup_params, 0, sizeof(*cmd->backup_params));
 }
 

diff --git a/lib/locking/cluster_locking.c b/lib/locking/cluster_locking.c
index 5ed8a339a3cbbe590c76dbec953571264bf923ba..d8f7de272c9acec2c414f034aeba0f5b15bfdd47 100644 (file)
--- a/lib/locking/cluster_locking.c
+++ b/lib/locking/cluster_locking.c
@@ -279,8 +279,7 @@ static int _cluster_request(char clvmd_cmd, const char *node, void *data, int le
        *response = rarray;
 
       out:
-       if (retbuf)
-               dm_free(retbuf);
+       dm_free(retbuf);
 
        return status;
 }

diff --git a/lib/misc/timestamp.c b/lib/misc/timestamp.c
index 62e1be86927f22ade9d8225e3055bc3270ba6d40..47b5586add8776aa2d378cec56728404e92b0cb1 100644 (file)
--- a/lib/misc/timestamp.c
+++ b/lib/misc/timestamp.c
@@ -125,6 +125,5 @@ int cmp_timestamp(struct timestamp *t1, struct timestamp *t2)
 
 void destroy_timestamp(struct timestamp *t)
 {
-       if (t)
-               dm_free(t);
+       dm_free(t);
 }

diff --git a/libdm/ioctl/libdm-iface.c b/libdm/ioctl/libdm-iface.c
index 92c8e9ecd468ab63c9aa2d8cc8fcff42920b0675..25714ce39cc307a116478764e9d2da7c9af98111 100644 (file)
--- a/libdm/ioctl/libdm-iface.c
+++ b/libdm/ioctl/libdm-iface.c
@@ -486,20 +486,11 @@ void dm_task_destroy(struct dm_task *dmt)
                dm_free(t);
        }
 
-       if (dmt->dev_name)
-               dm_free(dmt->dev_name);
-
-       if (dmt->newname)
-               dm_free(dmt->newname);
-
-       if (dmt->message)
-               dm_free(dmt->message);
-
        _dm_zfree_dmi(dmt->dmi.v4);
-
-       if (dmt->uuid)
-               dm_free(dmt->uuid);
-
+       dm_free(dmt->dev_name);
+       dm_free(dmt->newname);
+       dm_free(dmt->message);
+       dm_free(dmt->uuid);
        dm_free(dmt);
 }