+ ipmi-strstrip-conversion.patch added to -mm tree

[akpm@xxxxxxxx]

The patch titled

     ipmi: strstrip conversion

has been added to the -mm tree.  Its filename is

     ipmi-strstrip-conversion.patch

See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this


From: Pekka Enberg <penberg@xxxxxxxxxxxxxx>

Switch an open-coded strstrip() to use the new API.

Acked-by: Corey Minyard <minyard@xxxxxxx>
Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---

 drivers/char/ipmi/ipmi_watchdog.c |   25 +++++++++----------------
 1 files changed, 9 insertions(+), 16 deletions(-)

diff -puN drivers/char/ipmi/ipmi_watchdog.c~ipmi-strstrip-conversion drivers/char/ipmi/ipmi_watchdog.c
--- 25/drivers/char/ipmi/ipmi_watchdog.c~ipmi-strstrip-conversion	Wed Apr 26 14:09:28 2006
+++ 25-akpm/drivers/char/ipmi/ipmi_watchdog.c	Wed Apr 26 14:09:28 2006
@@ -212,24 +212,16 @@ static int set_param_str(const char *val
 {
 	action_fn  fn = (action_fn) kp->arg;
 	int        rv = 0;
-	const char *end;
-	char       valcp[16];
-	int        len;
-
-	/* Truncate leading and trailing spaces. */
-	while (isspace(*val))
-		val++;
-	end = val + strlen(val) - 1;
-	while ((end >= val) && isspace(*end))
-		end--;
-	len = end - val + 1;
-	if (len > sizeof(valcp) - 1)
-		return -EINVAL;
-	memcpy(valcp, val, len);
-	valcp[len] = '\0';
+	char       *dup, *s;
+
+	dup = kstrdup(val, GFP_KERNEL);
+	if (!dup)
+		return -ENOMEM;
+
+	s = strstrip(dup);
 
 	down_read(&register_sem);
-	rv = fn(valcp, NULL);
+	rv = fn(s, NULL);
 	if (rv)
 		goto out_unlock;
 
@@ -239,6 +231,7 @@ static int set_param_str(const char *val
 
  out_unlock:
 	up_read(&register_sem);
+	kfree(dup);
 	return rv;
 }
 
_

Patches currently in -mm which might be from penberg@xxxxxxxxxxxxxx are

git-gfs2.patch
slab-extract-cache_free_alien-from-__cache_free.patch
slab-page-mapping-cleanup.patch
read_mapping_page-for-address-space.patch
strstrip-api.patch
ipmi-strstrip-conversion.patch
slab-leaks3-default-y.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