shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

cleanup: missed conversion to dm_malloc/free usage

Browse Source 
Few missed unconverted dm_malloc/free calls.
This commit is contained in:
Zdenek Kabelac 2014-05-07 11:54:12 +02:00
parent d3e68c8a71
commit 9bccaf7ae4
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
daemons/clvmd/lvm-functions.c
View File

@ -236,7 +236,7 @@ void destroy_lvhash(void)
if ((status = sync_unlock(resource, lvi->lock_id))) if ((status = sync_unlock(resource, lvi->lock_id)))
DEBUGLOG("unlock_all. unlock failed(%d): %s\n", DEBUGLOG("unlock_all. unlock failed(%d): %s\n",
status, strerror(errno)); status, strerror(errno));
free(lvi); dm_free(lvi);
} }
dm_hash_destroy(lv_hash); dm_hash_destroy(lv_hash);
@ -286,8 +286,7 @@ static int hold_lock(char *resource, int mode, int flags)
strerror(errno)); strerror(errno));
errno = saved_errno; errno = saved_errno;
} else { } else {
lvi = malloc(sizeof(struct lv_info)); if (!(lvi = dm_malloc(sizeof(struct lv_info)))) {
if (!lvi) {
errno = ENOMEM; errno = ENOMEM;
return -1; return -1;
} }
@ -296,7 +295,7 @@ static int hold_lock(char *resource, int mode, int flags)
status = sync_lock(resource, mode, flags & ~LCKF_CONVERT, &lvi->lock_id); status = sync_lock(resource, mode, flags & ~LCKF_CONVERT, &lvi->lock_id);
saved_errno = errno; saved_errno = errno;
if (status) { if (status) {
free(lvi); dm_free(lvi);
DEBUGLOG("hold_lock. lock at %d failed: %s\n", mode, DEBUGLOG("hold_lock. lock at %d failed: %s\n", mode,
strerror(errno)); strerror(errno));
} else } else
@ -326,7 +325,7 @@ static int hold_unlock(char *resource)
saved_errno = errno; saved_errno = errno;
if (!status) { if (!status) {
remove_info(resource); remove_info(resource);
free(lvi); dm_free(lvi);
} else { } else {
DEBUGLOG("hold_unlock. unlock failed(%d): %s\n", status, DEBUGLOG("hold_unlock. unlock failed(%d): %s\n", status,
strerror(errno)); strerror(errno));