2 files changed, 8 insertions, 24 deletions

diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
index ee3c869d9701..200a0688f717 100644
--- a/drivers/md/dm-ioctl.c
+++ b/drivers/md/dm-ioctl.c
@@ -122,14 +122,6 @@ static struct hash_cell *__get_uuid_cell(const char *str)
 /*-----------------------------------------------------------------
  * Inserting, removing and renaming a device.
  *---------------------------------------------------------------*/
-static inline char *kstrdup(const char *str)
-{
-        char *r = kmalloc(strlen(str) + 1, GFP_KERNEL);
-        if (r)
-                strcpy(r, str);
-        return r;
-}
-
 static struct hash_cell *alloc_cell(const char *name, const char *uuid,
                                     struct mapped_device *md)
 {
@@ -139,7 +131,7 @@ static struct hash_cell *alloc_cell(const char *name, const char *uuid,
         if (!hc)
                 return NULL;
 
-        hc->name = kstrdup(name);
+        hc->name = kstrdup(name, GFP_KERNEL);
         if (!hc->name) {
                 kfree(hc);
                 return NULL;
@@ -149,7 +141,7 @@ static struct hash_cell *alloc_cell(const char *name, const char *uuid,
                 hc->uuid = NULL;
 
         else {
-                hc->uuid = kstrdup(uuid);
+                hc->uuid = kstrdup(uuid, GFP_KERNEL);
                 if (!hc->uuid) {
                         kfree(hc->name);
                         kfree(hc);
@@ -273,7 +265,7 @@ static int dm_hash_rename(const char *old, const char *new)
         /*
          * duplicate new.
          */
-        new_name = kstrdup(new);
+        new_name = kstrdup(new, GFP_KERNEL);
         if (!new_name)
                 return -ENOMEM;
 
diff --git a/drivers/parport/probe.c b/drivers/parport/probe.c
index c94963145e17..6e6f42d01e64 100644
--- a/drivers/parport/probe.c
+++ b/drivers/parport/probe.c
@@ -48,14 +48,6 @@ static void pretty_print(struct parport *port, int device)
         printk("\n");
 }
 
-static char *strdup(char *str)
-{
-        int n = strlen(str)+1;
-        char *s = kmalloc(n, GFP_KERNEL);
-        if (!s) return NULL;
-        return strcpy(s, str);
-}
-
 static void parse_data(struct parport *port, int device, char *str)
 {
         char *txt = kmalloc(strlen(str)+1, GFP_KERNEL);
@@ -88,16 +80,16 @@ static void parse_data(struct parport *port, int device, char *str)
                         if (!strcmp(p, "MFG") || !strcmp(p, "MANUFACTURER")) {
                                 if (info->mfr)
                                         kfree (info->mfr);
-                                info->mfr = strdup(sep);
+                                info->mfr = kstrdup(sep, GFP_KERNEL);
                         } else if (!strcmp(p, "MDL") || !strcmp(p, "MODEL")) {
                                 if (info->model)
                                         kfree (info->model);
-                                info->model = strdup(sep);
+                                info->model = kstrdup(sep, GFP_KERNEL);
                         } else if (!strcmp(p, "CLS") || !strcmp(p, "CLASS")) {
                                 int i;
                                 if (info->class_name)
                                         kfree (info->class_name);
-                                info->class_name = strdup(sep);
+                                info->class_name = kstrdup(sep, GFP_KERNEL);
                                 for (u = sep; *u; u++)
                                         *u = toupper(*u);
                                 for (i = 0; classes[i].token; i++) {
@@ -112,7 +104,7 @@ static void parse_data(struct parport *port, int device, char *str)
                                    !strcmp(p, "COMMAND SET")) {
                                 if (info->cmdset)
                                         kfree (info->cmdset);
-                                info->cmdset = strdup(sep);
+                                info->cmdset = kstrdup(sep, GFP_KERNEL);
                                 /* if it speaks printer language, it's
                                    probably a printer */
                                 if (strstr(sep, "PJL") || strstr(sep, "PCL"))
@@ -120,7 +112,7 @@ static void parse_data(struct parport *port, int device, char *str)
                         } else if (!strcmp(p, "DES") || !strcmp(p, "DESCRIPTION")) {
                                 if (info->description)
                                         kfree (info->description);
-                                info->description = strdup(sep);
+                                info->description = kstrdup(sep, GFP_KERNEL);
                         }
                 }
         rock_on: