From 1f60573e61a8541072fdc7ccade8b3b85c5220e6 Mon Sep 17 00:00:00 2001
From: Daniel Walter <sahne@0x90.at>
Date: Wed, 26 Sep 2012 21:51:46 +0200
Subject: [PATCH] --- yaml --- r: 333189 b: refs/heads/master c:
 7297cb682acb506ada2e01fbc9b447b04d69936c h: refs/heads/master i:   333187:
 bbdb9519690372a33c84e28f77b8fcc469a98997 v: v3

---
 [refs]               | 2 +-
 trunk/fs/nfs/idmap.c | 4 ++--
 trunk/fs/nfs/super.c | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 096977639144..f1f948a24afd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ee34e13620d0678d420ce50101aaef94ab81fc74
+refs/heads/master: 7297cb682acb506ada2e01fbc9b447b04d69936c
diff --git a/trunk/fs/nfs/idmap.c b/trunk/fs/nfs/idmap.c
index 9985a0aea5ff..27dde503a6b6 100644
--- a/trunk/fs/nfs/idmap.c
+++ b/trunk/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/trunk/fs/nfs/super.c b/trunk/fs/nfs/super.c
index 56f02a9bd6d3..a719bc0640b4 100644
--- a/trunk/fs/nfs/super.c
+++ b/trunk/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;