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>
diff --git a/fs/nfs/idmap.c b/fs/nfs/idmap.c
index 9985a0a..27dde50 100644
--- a/fs/nfs/idmap.c
+++ b/fs/nfs/idmap.c
@@ -158,7 +158,7 @@
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 @@
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 56f02a9..a719bc0 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -1112,7 +1112,7 @@
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 @@
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;