The patch titled
uml ubd driver: reformat ubd_config
has been added to the -mm tree. Its filename is
uml-ubd-driver-reformat-ubd_config.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: uml ubd driver: reformat ubd_config
From: Paolo 'Blaisorblade' Giarrusso <blaisorblade@xxxxxxxx>
Pure whitespace and style fixes split out from subsequent patch. Some changes
(err -> ret) don't make sense now, only later, but I split them out anyway
since they cluttered the patch.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@xxxxxxxx>
Cc: Jeff Dike <jdike@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/um/drivers/ubd_kern.c | 31 ++++++++++++++++++++-----------
1 file changed, 20 insertions(+), 11 deletions(-)
diff -puN arch/um/drivers/ubd_kern.c~uml-ubd-driver-reformat-ubd_config arch/um/drivers/ubd_kern.c
--- a/arch/um/drivers/ubd_kern.c~uml-ubd-driver-reformat-ubd_config
+++ a/arch/um/drivers/ubd_kern.c
@@ -703,27 +703,36 @@ out:
static int ubd_config(char *str)
{
- int n, err;
+ int n, ret;
str = kstrdup(str, GFP_KERNEL);
- if(str == NULL){
+ if (str == NULL) {
printk(KERN_ERR "ubd_config failed to strdup string\n");
- return(1);
+ ret = 1;
+ goto out;
}
- err = ubd_setup_common(str, &n);
- if(err){
- kfree(str);
- return(-1);
+ ret = ubd_setup_common(str, &n);
+ if (ret) {
+ ret = -1;
+ goto err_free;
+ }
+ if (n == -1) {
+ ret = 0;
+ goto out;
}
- if(n == -1) return(0);
mutex_lock(&ubd_lock);
- err = ubd_add(n);
- if(err)
+ ret = ubd_add(n);
+ if (ret)
ubd_devs[n].file = NULL;
mutex_unlock(&ubd_lock);
- return(err);
+out:
+ return ret;
+
+err_free:
+ kfree(str);
+ goto out;
}
static int ubd_get_config(char *name, char *str, int size, char **error_out)
_
Patches currently in -mm which might be from blaisorblade@xxxxxxxx are
fix-remove-the-use-of-_syscallx-macros-in-uml.patch
uml-fix-compilation-options-for-user_objs.patch
uml-ubd-driver-allow-using-up-to-16-ubd-devices.patch
uml-ubd-driver-document-some-struct-fields.patch
uml-ubd-driver-var-renames.patch
uml-ubd-driver-give-better-names-to-some-functions.patch
uml-ubd-driver-change-ubd_lock-to-be-a-mutex.patch
uml-ubd-driver-ubd_io_lock-usage-fixup.patch
uml-ubd-driver-reformat-ubd_config.patch
uml-ubd-driver-convert-do_ubd-to-a-boolean-variable.patch
uml-ubd-driver-use-bitfields-where-possible.patch
uml-ubd-driver-do-not-store-error-codes-as-fd.patch
uml-ubd-driver-various-little-changes.patch
uml-fix-prototypes.patch
uml-make-execvp-safe-for-our-usage.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
