aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs/super.c
diff options
context:
space:
mode:
authorDaniel Walter <sahne@0x90.at>2012-09-26 15:51:46 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2012-10-01 18:40:05 -0400
commit7297cb682acb506ada2e01fbc9b447b04d69936c (patch)
tree9babf7878f4a34552fd452e1e30a4d38f24add6e /fs/nfs/super.c
parentee34e13620d0678d420ce50101aaef94ab81fc74 (diff)
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>
Diffstat (limited to 'fs/nfs/super.c')
-rw-r--r--fs/nfs/super.c4
1 files changed, 2 insertions, 2 deletions
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;