Attachment 316070 Details for Bug 461469 – mpath propagate path errors

[patch] mpath propagate path errors

mpath_propagate_path_errors.patch (text/plain), 1.85 KB, created by Bryn M. Reeves on 2008-09-08 11:11:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bryn M. Reeves

Created: 2008-09-08 11:11:06 UTC

Size: 1.85 KB

patch

obsolete

>Index: linux-2.6.25.i686/drivers/md/dm-mpath.c
>===================================================================
>--- linux-2.6.25.i686.orig/drivers/md/dm-mpath.c
>+++ linux-2.6.25.i686/drivers/md/dm-mpath.c
>@@ -555,12 +555,12 @@ static struct pgpath *parse_path(struct 
> 	/* we need at least a path arg */
> 	if (as->argc < 1) {
> 		ti->error = "no device given";
>-		return NULL;
>+		return ERR_PTR(-EINVAL);
> 	}
> 
> 	p = alloc_pgpath();
> 	if (!p)
>-		return NULL;
>+		return ERR_PTR(-ENOMEM);
> 
> 	r = dm_get_device(ti, shift(as), ti->begin, ti->len,
> 			  dm_table_get_mode(ti->table), &p->path.dev);
>@@ -579,7 +579,7 @@ static struct pgpath *parse_path(struct 
> 
>  bad:
> 	free_pgpath(p);
>-	return NULL;
>+	return ERR_PTR(r);
> }
> 
> static struct priority_group *parse_priority_group(struct arg_set *as,
>@@ -598,13 +598,13 @@ static struct priority_group *parse_prio
> 	if (as->argc < 2) {
> 		as->argc = 0;
> 		ti->error = "not enough priority group aruments";
>-		return NULL;
>+		return ERR_PTR(-EINVAL);
> 	}
> 
> 	pg = alloc_priority_group();
> 	if (!pg) {
> 		ti->error = "couldn't allocate priority group";
>-		return NULL;
>+		return ERR_PTR(-ENOMEM);
> 	}
> 	pg->m = m;
> 
>@@ -635,8 +635,10 @@ static struct priority_group *parse_prio
> 		path_args.argv = as->argv;
> 
> 		pgpath = parse_path(&path_args, &pg->ps, ti);
>-		if (!pgpath)
>+		if (IS_ERR(pgpath)){
>+			r = PTR_ERR(pgpath);
> 			goto bad;
>+		}
> 
> 		pgpath->pg = pg;
> 		list_add_tail(&pgpath->list, &pg->pgpaths);
>@@ -647,7 +649,7 @@ static struct priority_group *parse_prio
> 
>  bad:
> 	free_priority_group(pg, ti);
>-	return NULL;
>+	return ERR_PTR(r);
> }
> 
> static int parse_hw_handler(struct arg_set *as, struct multipath *m)
>@@ -778,8 +780,8 @@ static int multipath_ctr(struct dm_targe
> 		struct priority_group *pg;
> 
> 		pg = parse_priority_group(&as, m);
>-		if (!pg) {
>-			r = -EINVAL;
>+		if (IS_ERR(pg)) {
>+			r = PTR_ERR(pg);
> 			goto bad;
> 		}
>

Actions: View | Diff

Attachments on bug 461469: 316070