diff options
| author | Daniel Walter <sahne@0x90.at> | 2012-09-26 21:51:46 +0200 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-10-01 15:40:05 -0700 |
| commit | 7297cb682acb506ada2e01fbc9b447b04d69936c (patch) | |
| tree | 9babf7878f4a34552fd452e1e30a4d38f24add6e | |
| parent | ee34e13620d0678d420ce50101aaef94ab81fc74 (diff) | |
| download | linux-3.10-7297cb682acb506ada2e01fbc9b447b04d69936c.tar.gz linux-3.10-7297cb682acb506ada2e01fbc9b447b04d69936c.tar.bz2 linux-3.10-7297cb682acb506ada2e01fbc9b447b04d69936c.zip | |
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>
| -rw-r--r-- | fs/nfs/idmap.c | 4 | ||||
| -rw-r--r-- | 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 9985a0aea5f..27dde503a6b 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 56f02a9bd6d..a719bc0640b 100644 --- a/fs/nfs/super.c +++ b/fs/nfs/super.c @@ -1112,7 +1112,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; @@ -2681,7 +2681,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; |