[PATCH 1/1] dm: Deletion of unnecessary checks before two function calls

[SF Markus Elfring]

From: Markus Elfring <elfr...@users.sourceforge.net>
Date: Wed, 19 Nov 2014 21:48:10 +0100

The functions dm_table_destroy() and vfree() perform also input
parameter validation. Thus the test around the call is not needed.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <elfr...@users.sourceforge.net>
---
 drivers/md/dm-ioctl.c           |  3 +--
 drivers/md/dm-snap-persistent.c | 12 ++++--------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
index 5152142..0b925a4 100644
--- a/drivers/md/dm-ioctl.c
+++ b/drivers/md/dm-ioctl.c
@@ -1050,8 +1050,7 @@ static int do_resume(struct dm_ioctl *param)
         * Since dm_swap_table synchronizes RCU, nobody should be in
         * read-side critical section already.
         */
-       if (old_map)
-               dm_table_destroy(old_map);
+       dm_table_destroy(old_map);
 
        if (!r)
                __dev_status(md, param);
diff --git a/drivers/md/dm-snap-persistent.c b/drivers/md/dm-snap-persistent.c
index d6e8817..4b29bac 100644
--- a/drivers/md/dm-snap-persistent.c
+++ b/drivers/md/dm-snap-persistent.c
@@ -200,16 +200,13 @@ err_area:
 
 static void free_area(struct pstore *ps)
 {
-       if (ps->area)
-               vfree(ps->area);
+       vfree(ps->area);
        ps->area = NULL;
 
-       if (ps->zero_area)
-               vfree(ps->zero_area);
+       vfree(ps->zero_area);
        ps->zero_area = NULL;
 
-       if (ps->header_area)
-               vfree(ps->header_area);
+       vfree(ps->header_area);
        ps->header_area = NULL;
 }
 
@@ -605,8 +602,7 @@ static void persistent_dtr(struct dm_exception_store *store)
        free_area(ps);
 
        /* Allocated in persistent_read_metadata */
-       if (ps->callbacks)
-               vfree(ps->callbacks);
+       vfree(ps->callbacks);
 
        kfree(ps);
 }
-- 
2.1.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/