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

cleanup: mark success at the end

Browse Source 
Simplify setting 'success' return value and use common use-pattern
for handling return code.
This commit is contained in:
Zdenek Kabelac 2017-12-04 12:49:57 +01:00
parent 10f37345eb
commit e3366787b6
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libdm/libdm-deptree.c
View File

@ -875,7 +875,7 @@ static int _info_by_dev(uint32_t major, uint32_t minor, int with_open_count,
const char **name, const char **uuid) const char **name, const char **uuid)
{ {
struct dm_task *dmt; struct dm_task *dmt;
int r; int r = 0;
if (!(dmt = dm_task_create(DM_DEVICE_INFO))) { if (!(dmt = dm_task_create(DM_DEVICE_INFO))) {
log_error("_info_by_dev: dm_task creation failed"); log_error("_info_by_dev: dm_task creation failed");
@ -883,32 +883,30 @@ static int _info_by_dev(uint32_t major, uint32_t minor, int with_open_count,
} }
if (!dm_task_set_major(dmt, major) || !dm_task_set_minor(dmt, minor)) { if (!dm_task_set_major(dmt, major) || !dm_task_set_minor(dmt, minor)) {
log_error("_info_by_dev: Failed to set device number"); log_error("_info_by_dev: Failed to set device number.");
dm_task_destroy(dmt); goto out;
return 0;
} }
if (!with_open_count && !dm_task_no_open_count(dmt)) if (!with_open_count && !dm_task_no_open_count(dmt))
log_warn("WARNING: Failed to disable open_count."); log_warn("WARNING: Failed to disable open_count.");
if (!(r = dm_task_run(dmt))) if (!dm_task_run(dmt))
goto_out; goto_out;
if (!(r = dm_task_get_info(dmt, info))) if (!dm_task_get_info(dmt, info))
goto_out; goto_out;
if (name && !(*name = dm_pool_strdup(mem, dm_task_get_name(dmt)))) { if (name && !(*name = dm_pool_strdup(mem, dm_task_get_name(dmt)))) {
log_error("name pool_strdup failed"); log_error("name pool_strdup failed");
r = 0;
goto out; goto out;
} }
if (uuid && !(*uuid = dm_pool_strdup(mem, dm_task_get_uuid(dmt)))) { if (uuid && !(*uuid = dm_pool_strdup(mem, dm_task_get_uuid(dmt)))) {
log_error("uuid pool_strdup failed"); log_error("uuid pool_strdup failed");
r = 0;
goto out; goto out;
} }
r = 1;
out: out:
dm_task_destroy(dmt); dm_task_destroy(dmt);
@ -1341,7 +1339,7 @@ static int _suspend_node(const char *name, uint32_t major, uint32_t minor,
int skip_lockfs, int no_flush, struct dm_info *newinfo) int skip_lockfs, int no_flush, struct dm_info *newinfo)
{ {
struct dm_task *dmt; struct dm_task *dmt;
int r; int r = 0;
log_verbose("Suspending %s (%" PRIu32 ":%" PRIu32 ")%s%s", log_verbose("Suspending %s (%" PRIu32 ":%" PRIu32 ")%s%s",
name, major, minor, name, major, minor,
@ -1355,8 +1353,7 @@ static int _suspend_node(const char *name, uint32_t major, uint32_t minor,
if (!dm_task_set_major(dmt, major) || !dm_task_set_minor(dmt, minor)) { if (!dm_task_set_major(dmt, major) || !dm_task_set_minor(dmt, minor)) {
log_error("Failed to set device number for %s suspension.", name); log_error("Failed to set device number for %s suspension.", name);
dm_task_destroy(dmt); goto out;
return 0;
} }
if (!dm_task_no_open_count(dmt)) if (!dm_task_no_open_count(dmt))
@ -1372,7 +1369,7 @@ static int _suspend_node(const char *name, uint32_t major, uint32_t minor,
inc_suspended(); inc_suspended();
r = dm_task_get_info(dmt, newinfo); r = dm_task_get_info(dmt, newinfo);
} }
out:
dm_task_destroy(dmt); dm_task_destroy(dmt);
return r; return r;