Attachment 295566 Details for Bug 433857 – patch sent upstream

[patch] patch sent upstream

fix_dm_stuff (text/plain), 3.00 KB, created by Eric Sandeen on 2008-02-21 22:35:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Eric Sandeen

Created: 2008-02-21 22:35:10 UTC

Size: 3.00 KB

patch

obsolete

>Index: e2fsprogs-1.40.5/lib/blkid/devname.c
>===================================================================
>--- e2fsprogs-1.40.5.orig/lib/blkid/devname.c
>+++ e2fsprogs-1.40.5/lib/blkid/devname.c
>@@ -171,37 +171,42 @@ static int dm_device_has_dep(const dev_t
> 	struct dm_deps *deps;
> 	struct dm_info info;
> 	unsigned int i;
>+	int ret = 0;
> 
> 	task = dm_task_create(DM_DEVICE_DEPS);
> 	if (!task)
>-		return 0;
>+		goto out;
> 
>-	dm_task_set_name(task, name);
>-	dm_task_run(task);
>-	dm_task_get_info(task, &info);
>+	if (!dm_task_set_name(task, name))
>+		goto out;
> 
>-	if (!info.exists) {
>-		dm_task_destroy(task);
>-		return 0;
>-	}
>+	if (!dm_task_run(task))
>+		goto out;
>+
>+	if (!dm_task_get_info(task, &info))
>+		goto out;
>+
>+	if  (!info.exists)
>+		goto out;
> 
> 	deps = dm_task_get_deps(task);
>-	if (!deps || deps->count == 0) {
>-		dm_task_destroy(task);
>-		return 0;
>-	}
>+	if (!deps || deps->count == 0)
>+		goto out;
> 
> 	for (i = 0; i < deps->count; i++) {
> 		dev_t dep_dev = deps->device[i];
> 
> 		if (dev == dep_dev) {
>-			dm_task_destroy(task);
>-			return 1;
>+			ret = 1;
>+			goto out;
> 		}
> 	}
> 
>-	dm_task_destroy(task);
>-	return 0;
>+out:
>+	if (task)
>+		dm_task_destroy(task);
>+
>+	return ret;
> }
> 
> static int dm_device_is_leaf(const dev_t dev)
>@@ -214,15 +219,16 @@ static int dm_device_is_leaf(const dev_t
> 	dm_log_init(dm_quiet_log);
> 	task = dm_task_create(DM_DEVICE_LIST);
> 	if (!task)
>-		return 1;
>+		goto out;
>+
> 	dm_log_init(0);
> 
>-	dm_task_run(task);
>+	if (!dm_task_run(task))
>+		goto out;
>+
> 	names = dm_task_get_names(task);
>-	if (!names || !names->dev) {
>-		dm_task_destroy(task);
>-		return 1;
>-	}
>+	if (!names || !names->dev)
>+		goto out;
> 
> 	n = 0;
> 	do {
>@@ -234,7 +240,9 @@ static int dm_device_is_leaf(const dev_t
> 		next = names->next;
> 	} while (next);
> 
>-	dm_task_destroy(task);
>+out:
>+	if (task)
>+		dm_task_destroy(task);
> 
> 	return ret;
> }
>@@ -247,20 +255,25 @@ static dev_t dm_get_devno(const char *na
> 
> 	task = dm_task_create(DM_DEVICE_INFO);
> 	if (!task)
>-		return ret;
>+		goto out;
> 
>-	dm_task_set_name(task, name);
>-	dm_task_run(task);
>-	dm_task_get_info(task, &info);
>+	if (!dm_task_set_name(task, name))
>+		goto out;
> 
>-	if (!info.exists) {
>-		dm_task_destroy(task);
>-		return ret;
>-	}
>+	if (!dm_task_run(task))
>+		goto out;
>+
>+	if (!dm_task_get_info(task, &info))
>+		goto out;
>+
>+	if (!info.exists)
>+		goto out;
> 
> 	ret = makedev(info.major, info.minor);
> 
>-	dm_task_destroy(task);
>+out:
>+	if (task)
>+		dm_task_destroy(task);
> 	
> 	return ret;
> }
>@@ -275,15 +288,15 @@ static void dm_probe_all(blkid_cache cac
> 	dm_log_init(dm_quiet_log);
> 	task = dm_task_create(DM_DEVICE_LIST);
> 	if (!task)
>-		return;
>+		goto out;
> 	dm_log_init(0);
> 
>-	dm_task_run(task);
>+	if (!dm_task_run(task))
>+		goto out;
>+
> 	names = dm_task_get_names(task);
>-	if (!names || !names->dev) {
>-		dm_task_destroy(task);
>-		return;
>-	}
>+	if (!names || !names->dev)
>+		goto out;
> 
> 	n = 0;
> 	do {
>@@ -311,7 +324,9 @@ try_next:
> 		next = names->next;
> 	} while (next);
> 
>-	dm_task_destroy(task);
>+out:
>+	if (task)
>+		dm_task_destroy(task);
> }
> #endif /* HAVE_DEVMAPPER */
>

Actions: View | Diff

Attachments on bug 433857: 295554 | 295566