Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 7297cb682acb506ada2e01fbc9b447b04d69936c

Authored by Daniel Walter
Committed by Trond Myklebust
1 parent ee34e13620
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

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>

Showing 2 changed files with 4 additions and 4 deletions Side-by-side Diff

... ... @@ -158,7 +158,7 @@
158 158 return 0;
159 159 memcpy(buf, name, namelen);
160 160 buf[namelen] = '\0';
161   - if (strict_strtoul(buf, 0, &val) != 0)
  161 + if (kstrtoul(buf, 0, &val) != 0)
162 162 return 0;
163 163 *res = val;
164 164 return 1;
... ... @@ -364,7 +364,7 @@
364 364 if (data_size <= 0) {
365 365 ret = -EINVAL;
366 366 } else {
367   - ret = strict_strtol(id_str, 10, &id_long);
  367 + ret = kstrtol(id_str, 10, &id_long);
368 368 *id = (__u32)id_long;
369 369 }
370 370 return ret;
... ... @@ -1112,7 +1112,7 @@
1112 1112 string = match_strdup(args);
1113 1113 if (string == NULL)
1114 1114 return -ENOMEM;
1115   - rc = strict_strtoul(string, 10, option);
  1115 + rc = kstrtoul(string, 10, option);
1116 1116 kfree(string);
1117 1117  
1118 1118 return rc;
... ... @@ -2681,7 +2681,7 @@
2681 2681  
2682 2682 if (!val)
2683 2683 return -EINVAL;
2684   - ret = strict_strtoul(val, 0, &num);
  2684 + ret = kstrtoul(val, 0, &num);
2685 2685 if (ret == -EINVAL || num > NFS_CALLBACK_MAXPORTNR)
2686 2686 return -EINVAL;
2687 2687 *((unsigned int *)kp->arg) = num;