nfs: replace strict_strto* with kstrto*

PATCH New Daniel Walter 1 participant 1 message Sep 26, 2012

Subsystems (2)

NFS client NFS server

lore

Share & tools

lore

Daniel Walter

author

2012-09-26 20:01 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

---
apply against current linux-2.6 tree

---
 fs/nfs/idmap.c |    4 ++--
 fs/nfs/super.c |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

---

fs/nfs/idmap.c +2 -2

index a850079..814f467 100644
@@ -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;

fs/nfs/super.c +2 -2

index b8eda70..4f62ff1 100644
@@ -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;