diff options
| author | Zdenek Kabelac <zkabelac@redhat.com> | 2011-10-11 08:59:42 +0000 |
|---|---|---|
| committer | Zdenek Kabelac <zkabelac@redhat.com> | 2011-10-11 08:59:42 +0000 |
| commit | de75bc6688b9e96ae07f8e623233eb538351db97 (patch) | |
| tree | dad7dfc4155224e7b409e445189ecbddefd636e6 /lib/activate | |
| parent | 4007ac814f019106d8ae47bb5fc2095537ea313c (diff) | |
| download | lvm2-de75bc6688b9e96ae07f8e623233eb538351db97.tar.gz lvm2-de75bc6688b9e96ae07f8e623233eb538351db97.tar.xz lvm2-de75bc6688b9e96ae07f8e623233eb538351db97.zip | |
Improve backtrace reporting
Add <backtrace> so the function appears logged for the fail path.
Diffstat (limited to 'lib/activate')
| -rw-r--r-- | lib/activate/dev_manager.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/lib/activate/dev_manager.c b/lib/activate/dev_manager.c index 87a2b61b..e2892f8b 100644 --- a/lib/activate/dev_manager.c +++ b/lib/activate/dev_manager.c @@ -1941,7 +1941,10 @@ int dev_manager_activate(struct dev_manager *dm, struct logical_volume *lv, if (!_tree_action(dm, lv, laopts, ACTIVATE)) return_0; - return _tree_action(dm, lv, laopts, CLEAN); + if (!_tree_action(dm, lv, laopts, CLEAN)) + return_0; + + return 1; } /* origin_only may only be set if we are resuming (not activating) an origin LV */ @@ -1949,7 +1952,7 @@ int dev_manager_preload(struct dev_manager *dm, struct logical_volume *lv, struct lv_activate_opts *laopts, int *flush_required) { if (!_tree_action(dm, lv, laopts, PRELOAD)) - return 0; + return_0; *flush_required = dm->flush_required; @@ -1959,11 +1962,11 @@ int dev_manager_preload(struct dev_manager *dm, struct logical_volume *lv, int dev_manager_deactivate(struct dev_manager *dm, struct logical_volume *lv) { struct lv_activate_opts laopts = { 0 }; - int r; - r = _tree_action(dm, lv, &laopts, DEACTIVATE); + if (!_tree_action(dm, lv, &laopts, DEACTIVATE)) + return_0; - return r; + return 1; } int dev_manager_suspend(struct dev_manager *dm, struct logical_volume *lv, @@ -1971,7 +1974,10 @@ int dev_manager_suspend(struct dev_manager *dm, struct logical_volume *lv, { dm->flush_required = flush_required; - return _tree_action(dm, lv, laopts, lockfs ? SUSPEND_WITH_LOCKFS : SUSPEND); + if (!_tree_action(dm, lv, laopts, lockfs ? SUSPEND_WITH_LOCKFS : SUSPEND)) + return_0; + + return 1; } /* |