summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Elfring <elfring@users.sourceforge.net>2015-02-02 14:38:29 +0100
committerMike Snitzer <snitzer@redhat.com>2015-02-09 13:06:49 -0500
commit0c8f86322f4debca6dc899603e56397a6ae7c2dc (patch)
tree7c978f79e25a511491fce72bbc1e59ba366ac3eb
parentff658e9c1aae9a84dd06d46f847dc0cd2bf0dd11 (diff)
downloadop-kernel-dev-0c8f86322f4debca6dc899603e56397a6ae7c2dc.zip
op-kernel-dev-0c8f86322f4debca6dc899603e56397a6ae7c2dc.tar.gz
dm snapshot: remove unnecessary NULL checks before vfree() calls
The vfree() function performs input parameter validation. Thus the NULL pointer test around vfree() calls is not needed. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> Signed-off-by: Mike Snitzer <snitzer@redhat.com>
-rw-r--r--drivers/md/dm-snap-persistent.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/md/dm-snap-persistent.c b/drivers/md/dm-snap-persistent.c
index d6e8817..808b841 100644
--- a/drivers/md/dm-snap-persistent.c
+++ b/drivers/md/dm-snap-persistent.c
@@ -200,16 +200,11 @@ 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 +600,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);
}
OpenPOWER on IntegriCloud