Attachment 298368 Details for Bug 321241 – Patch to fix the problem.

[patch] Patch to fix the problem.

Fix-to-handle-the-return-value-of-dm_task_run.patch (text/plain), 1.72 KB, created by Makoto Dei on 2008-03-18 11:07:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Makoto Dei

Created: 2008-03-18 11:07:00 UTC

Size: 1.72 KB

patch

obsolete

>From 5de9c23a9d64f83053ccb9e1b7cc0d865f0ef5db Mon Sep 17 00:00:00 2001
>From: Makoto Dei <makoto@turbolinux.co.jp>
>Date: Tue, 18 Mar 2008 11:48:41 +0100
>Subject: [PATCH] Fix to handle the return value of dm_task_run
>
>dm_task_run returns 0 (failure) or 1 (success) instead of
>negative (< 0, failure) or positive (>= 0, success).
>---
> nash/dm.c |   20 ++++++++------------
> 1 files changed, 8 insertions(+), 12 deletions(-)
>
>diff --git a/nash/dm.c b/nash/dm.c
>index 3e493b7..edf3bbc 100644
>--- a/nash/dm.c
>+++ b/nash/dm.c
>@@ -48,7 +48,7 @@ nashDmTaskNew(int type, const char *name, struct dm_task **task)
>         return -1;
>     if (name)
>         dm_task_set_name(*task, name);
>-    ret = dm_task_run(*task);
>+    ret = dm_task_run(*task) ? 1 : -1;
>     if (ret < 0) {
>         dm_task_destroy(*task);
>         *task = NULL;
>@@ -144,7 +144,10 @@ nashDmGetDev(const char *name)
>         return 0;
> 
>     dm_task_set_name(task, name);
>-    dm_task_run(task);
>+    if (!dm_task_run(task)) {
>+        dm_task_destroy(task);
>+        return 0;
>+    }
> 
>     dm_task_get_info(task, &info);
>     if (!info.exists) {
>@@ -216,10 +219,7 @@ nashDmCreate(nashContext *nc, char *name, char *uuid, long long start,
> 
>     dm_task_update_nodes();
> 
>-    if (rc < 0)
>-        return 0;
>-
>-    return 1;
>+    return rc;
> }
> 
> #if 0
>@@ -267,10 +267,7 @@ nashDmRemove(char *name)
> 
>     dm_task_update_nodes();
> 
>-    if (rc < 0)
>-        return 0;
>-
>-    return 1;
>+    return rc;
> }
> 
> #if 0
>@@ -504,8 +501,7 @@ out:
>         free(iter);
>         return NULL;
>     }
>-    dm_task_run(task);
>-    if (!(dmnames = dm_task_get_names(task))) {
>+    if (!dm_task_run(task) || !(dmnames = dm_task_get_names(task))) {
>         dm_task_destroy(task);
>         goto out;
>     }
>-- 
>1.5.3.4
>

Actions: View | Diff

Attachments on bug 321241: 218341 | 298368