File 0012-Incremental-Remove-unnecesary-NULL-pointer-checks-wh.patch of Package mdadm.7129
From fe112c9eba73783879ad661bb0936d0be26d5274 Mon Sep 17 00:00:00 2001
From: Jes Sorensen <Jes.Sorensen@redhat.com>
Date: Mon, 7 Mar 2016 12:07:45 -0500
Subject: [PATCH 233/359] Incremental: Remove unnecesary NULL pointer checks
when calling sysfs_free()
References: bsc#1081910
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Coly Li <colyli@suse.de>
---
Incremental.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/Incremental.c b/Incremental.c
index 24fd827..ba97b00 100644
--- a/Incremental.c
+++ b/Incremental.c
@@ -644,8 +644,7 @@ out:
close(mdfd);
if (policy)
dev_policy_free(policy);
- if (sra)
- sysfs_free(sra);
+ sysfs_free(sra);
return rv;
out_unlock:
map_unlock(&map);
@@ -989,8 +988,7 @@ static int array_try_spare(char *devname, int *dfdp, struct dev_policy *pol,
sizeof(target->uuid)) == 0 &&
sra->array.failed_disks > 0) {
/* This is our target!! */
- if (chosen)
- sysfs_free(chosen);
+ sysfs_free(chosen);
chosen = sra;
sra = NULL;
/* skip to end so we don't check any more */
@@ -1022,8 +1020,7 @@ static int array_try_spare(char *devname, int *dfdp, struct dev_policy *pol,
sra = NULL;
}
next:
- if (sra)
- sysfs_free(sra);
+ sysfs_free(sra);
if (st != st2)
free(st2);
if (dl)
--
2.16.1