diff options
author | Daniel Walter <sahne@0x90.at> | 2012-09-26 15:51:46 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-10-01 18:40:05 -0400 |
commit | 7297cb682acb506ada2e01fbc9b447b04d69936c (patch) | |
tree | 9babf7878f4a34552fd452e1e30a4d38f24add6e /fs/nfs/idmap.c | |
parent | ee34e13620d0678d420ce50101aaef94ab81fc74 (diff) |
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>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/idmap.c')
-rw-r--r-- | fs/nfs/idmap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfs/idmap.c b/fs/nfs/idmap.c index 9985a0aea5ff..27dde503a6b6 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 | |||
158 | return 0; | 158 | return 0; |
159 | memcpy(buf, name, namelen); | 159 | memcpy(buf, name, namelen); |
160 | buf[namelen] = '\0'; | 160 | buf[namelen] = '\0'; |
161 | if (strict_strtoul(buf, 0, &val) != 0) | 161 | if (kstrtoul(buf, 0, &val) != 0) |
162 | return 0; | 162 | return 0; |
163 | *res = val; | 163 | *res = val; |
164 | return 1; | 164 | return 1; |
@@ -364,7 +364,7 @@ static int nfs_idmap_lookup_id(const char *name, size_t namelen, const char *typ | |||
364 | if (data_size <= 0) { | 364 | if (data_size <= 0) { |
365 | ret = -EINVAL; | 365 | ret = -EINVAL; |
366 | } else { | 366 | } else { |
367 | ret = strict_strtol(id_str, 10, &id_long); | 367 | ret = kstrtol(id_str, 10, &id_long); |
368 | *id = (__u32)id_long; | 368 | *id = (__u32)id_long; |
369 | } | 369 | } |
370 | return ret; | 370 | return ret; |