lkml.org 
[lkml]   [2012]   [Sep]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH] nfs: replace strict_strto* with kstrto*
[nfs] replace strict_str* with kstr* variants

* replace string conversions with newer kstr* functions

Signed-off-by: Daniel Walter <sahne@0x90.at>
---
apply against current linux-2.6 tree
---
fs/nfs/idmap.c | 4 ++--
fs/nfs/super.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/fs/nfs/idmap.c b/fs/nfs/idmap.c
index a850079..814f467 100644
--- a/fs/nfs/idmap.c
+++ b/fs/nfs/idmap.c
@@ -158,7 +158,7 @@ static int nfs_map_string_to_numeric(const char *name, size_t namelen, __u32 *re
return 0;
memcpy(buf, name, namelen);
buf[namelen] = '\0';
- if (strict_strtoul(buf, 0, &val) != 0)
+ if (kstrtoul(buf, 0, &val) != 0)
return 0;
*res = val;
return 1;
@@ -364,7 +364,7 @@ static int nfs_idmap_lookup_id(const char *name, size_t namelen, const char *typ
if (data_size <= 0) {
ret = -EINVAL;
} else {
- ret = strict_strtol(id_str, 10, &id_long);
+ ret = kstrtol(id_str, 10, &id_long);
*id = (__u32)id_long;
}
return ret;
diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index b8eda70..4f62ff1 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -1106,7 +1106,7 @@ static int nfs_get_option_ul(substring_t args[], unsigned long *option)
string = match_strdup(args);
if (string == NULL)
return -ENOMEM;
- rc = strict_strtoul(string, 10, option);
+ rc = kstrtoul(string, 10, option);
kfree(string);

return rc;
@@ -2659,7 +2659,7 @@ static int param_set_portnr(const char *val, const struct kernel_param *kp)

if (!val)
return -EINVAL;
- ret = strict_strtoul(val, 0, &num);
+ ret = kstrtoul(val, 0, &num);
if (ret == -EINVAL || num > NFS_CALLBACK_MAXPORTNR)
return -EINVAL;
*((unsigned int *)kp->arg) = num;

\
 
 \ /
  Last update: 2012-09-26 22:41    [W:0.823 / U:0.104 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site