shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-03-10 16:58:47 +03:00
Code Releases Activity

Detect errors from dm_task_set calls

Browse Source 
Check for errors in dm_task_set calls.
Use  goto_bad macro with stack trace.
Replace  label  failed: with bad:.
This commit is contained in:
Zdenek Kabelac 2010-12-22 15:28:44 +00:00
parent 3812984422
commit 4388a09b0f
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW
View File

@ -1,5 +1,6 @@
Version 2.02.80 - Version 2.02.80 -
==================================== ====================================
Detect errors from dm_task_set calls in _get_device_info (dmeventd).
Add backtraces for archive and backup_locally in check_current_backup(). Add backtraces for archive and backup_locally in check_current_backup().
Fix memory leak in debug mode of restart_clvmd() error path. Fix memory leak in debug mode of restart_clvmd() error path.
Log error message for pthread_join() failure in clvmd. Log error message for pthread_join() failure in clvmd.

27
daemons/dmeventd/libdevmapper-event.c
View File

@ -538,34 +538,37 @@ static struct dm_task *_get_device_info(const struct dm_event_handler *dmevh)
return NULL; return NULL;
} }
if (dmevh->uuid) if (dmevh->uuid) {
dm_task_set_uuid(dmt, dmevh->uuid); if (!dm_task_set_uuid(dmt, dmevh->uuid))
else if (dmevh->dev_name) goto_bad;
dm_task_set_name(dmt, dmevh->dev_name); } else if (dmevh->dev_name) {
else if (dmevh->major && dmevh->minor) { if (!dm_task_set_name(dmt, dmevh->dev_name))
dm_task_set_major(dmt, dmevh->major); goto_bad;
dm_task_set_minor(dmt, dmevh->minor); } else if (dmevh->major && dmevh->minor) {
} if (!dm_task_set_major(dmt, dmevh->major) ||
!dm_task_set_minor(dmt, dmevh->minor))
goto_bad;
}
/* FIXME Add name or uuid or devno to messages */ /* FIXME Add name or uuid or devno to messages */
if (!dm_task_run(dmt)) { if (!dm_task_run(dmt)) {
log_error("_get_device_info: dm_task_run() failed"); log_error("_get_device_info: dm_task_run() failed");
goto failed; goto bad;
} }
if (!dm_task_get_info(dmt, &info)) { if (!dm_task_get_info(dmt, &info)) {
log_error("_get_device_info: failed to get info for device"); log_error("_get_device_info: failed to get info for device");
goto failed; goto bad;
} }
if (!info.exists) { if (!info.exists) {
log_error("_get_device_info: device not found"); log_error("_get_device_info: device not found");
goto failed; goto bad;
} }
return dmt; return dmt;
failed: bad:
dm_task_destroy(dmt); dm_task_destroy(dmt);
return NULL; return NULL;
} }