diff options
| author | Zdenek Kabelac <zkabelac@redhat.com> | 2021-02-27 14:14:25 +0100 |
|---|---|---|
| committer | Zdenek Kabelac <zkabelac@redhat.com> | 2021-03-02 22:57:35 +0100 |
| commit | eb3dcc72eb0e1f3922dafcc4d018db70aabc3bc9 (patch) | |
| tree | d3ca7c378d453dc488a9371367e2ef7bed930e71 /daemons/lvmlockd | |
| parent | 0b7a4503e51d29454bdb8852dfd2a39276f828af (diff) | |
| download | lvm2-eb3dcc72eb0e1f3922dafcc4d018db70aabc3bc9.tar.gz | |
cleanup: free already checks for NULL
Diffstat (limited to 'daemons/lvmlockd')
| -rw-r--r-- | daemons/lvmlockd/lvmlockd-dlm.c | 3 | ||||
| -rw-r--r-- | daemons/lvmlockd/lvmlockd-sanlock.c | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/daemons/lvmlockd/lvmlockd-dlm.c b/daemons/lvmlockd/lvmlockd-dlm.c index 7915cc008..dc665e0a4 100644 --- a/daemons/lvmlockd/lvmlockd-dlm.c +++ b/daemons/lvmlockd/lvmlockd-dlm.c @@ -327,8 +327,7 @@ int lm_rem_resource_dlm(struct lockspace *ls, struct resource *r) log_error("S %s R %s rem_resource_dlm unlock error %d", ls->name, r->name, rv); } out: - if (rdd->vb) - free(rdd->vb); + free(rdd->vb); memset(rdd, 0, sizeof(struct rd_dlm)); r->lm_init = 0; diff --git a/daemons/lvmlockd/lvmlockd-sanlock.c b/daemons/lvmlockd/lvmlockd-sanlock.c index 4bc6402cf..36d57767f 100644 --- a/daemons/lvmlockd/lvmlockd-sanlock.c +++ b/daemons/lvmlockd/lvmlockd-sanlock.c @@ -1503,8 +1503,7 @@ out: fail: if (lms && lms->sock) close(lms->sock); - if (lms) - free(lms); + free(lms); return ret; } @@ -1634,8 +1633,7 @@ int lm_rem_resource_sanlock(struct lockspace *ls, struct resource *r) /* FIXME: assert r->mode == UN or unlock if it's not? */ - if (rds->vb) - free(rds->vb); + free(rds->vb); memset(rds, 0, sizeof(struct rd_sanlock)); r->lm_init = 0; |