diff options
Diffstat (limited to 'fs')
-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 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; |
diff --git a/fs/nfs/super.c b/fs/nfs/super.c index 56f02a9bd6d3..a719bc0640b4 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) | |||
1112 | string = match_strdup(args); | 1112 | string = match_strdup(args); |
1113 | if (string == NULL) | 1113 | if (string == NULL) |
1114 | return -ENOMEM; | 1114 | return -ENOMEM; |
1115 | rc = strict_strtoul(string, 10, option); | 1115 | rc = kstrtoul(string, 10, option); |
1116 | kfree(string); | 1116 | kfree(string); |
1117 | 1117 | ||
1118 | return rc; | 1118 | return rc; |
@@ -2681,7 +2681,7 @@ static int param_set_portnr(const char *val, const struct kernel_param *kp) | |||
2681 | 2681 | ||
2682 | if (!val) | 2682 | if (!val) |
2683 | return -EINVAL; | 2683 | return -EINVAL; |
2684 | ret = strict_strtoul(val, 0, &num); | 2684 | ret = kstrtoul(val, 0, &num); |
2685 | if (ret == -EINVAL || num > NFS_CALLBACK_MAXPORTNR) | 2685 | if (ret == -EINVAL || num > NFS_CALLBACK_MAXPORTNR) |
2686 | return -EINVAL; | 2686 | return -EINVAL; |
2687 | *((unsigned int *)kp->arg) = num; | 2687 | *((unsigned int *)kp->arg) = num; |