Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 57103d7fe1833857cf542a482c1eb8da0bf86e5d

Authored by Jingoo Han
Committed by Nicholas Bellinger
1 parent d4e4ab86bc
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

target: replace strict_strto*() with kstrto*() 

The usage of strict_strtoul() and strict_strtoull() is not preferred,
because strict_strtoul() and strict_strtoull() are obsolete. Thus,
kstrtoul() and kstrtoull() should be used.

v2: Fix incorrect return in ft_add_tpg (Fengguang)

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>

Showing 9 changed files with 64 additions and 52 deletions Side-by-side Diff

drivers/target/iscsi/iscsi_target_configfs.c
Diff comments   View file @ 57103d7
... ... @@ -265,9 +265,9 @@
265 265 *port_str = '\0'; /* Terminate string for IP */
266 266 port_str++; /* Skip over ":" */
267 267  
268   - ret = strict_strtoul(port_str, 0, &port);
  268 + ret = kstrtoul(port_str, 0, &port);
269 269 if (ret < 0) {
270   - pr_err("strict_strtoul() failed for port_str: %d\n", ret);
  270 + pr_err("kstrtoul() failed for port_str: %d\n", ret);
271 271 return ERR_PTR(ret);
272 272 }
273 273 sock_in6 = (struct sockaddr_in6 *)&sockaddr;
274 274  
... ... @@ -290,9 +290,9 @@
290 290 *port_str = '\0'; /* Terminate string for IP */
291 291 port_str++; /* Skip over ":" */
292 292  
293   - ret = strict_strtoul(port_str, 0, &port);
  293 + ret = kstrtoul(port_str, 0, &port);
294 294 if (ret < 0) {
295   - pr_err("strict_strtoul() failed for port_str: %d\n", ret);
  295 + pr_err("kstrtoul() failed for port_str: %d\n", ret);
296 296 return ERR_PTR(ret);
297 297 }
298 298 sock_in = (struct sockaddr_in *)&sockaddr;
drivers/target/iscsi/iscsi_target_login.c
Diff comments   View file @ 57103d7
... ... @@ -428,7 +428,7 @@
428 428 ISCSI_LOGIN_STATUS_NO_RESOURCES);
429 429 return -1;
430 430 }
431   - rc = strict_strtoul(param->value, 0, &mrdsl);
  431 + rc = kstrtoul(param->value, 0, &mrdsl);
432 432 if (rc < 0) {
433 433 iscsit_tx_login_rsp(conn, ISCSI_STATUS_CLS_TARGET_ERR,
434 434 ISCSI_LOGIN_STATUS_NO_RESOURCES);
drivers/target/iscsi/iscsi_target_parameters.c
Diff comments   View file @ 57103d7
... ... @@ -1182,7 +1182,7 @@
1182 1182 unsigned long long tmp;
1183 1183 int rc;
1184 1184  
1185   - rc = strict_strtoull(param->value, 0, &tmp);
  1185 + rc = kstrtoull(param->value, 0, &tmp);
1186 1186 if (rc < 0)
1187 1187 return -1;
1188 1188  
drivers/target/target_core_alua.c
Diff comments   View file @ 57103d7
... ... @@ -1756,10 +1756,10 @@
1756 1756 unsigned long tmp;
1757 1757 int ret;
1758 1758  
1759   - ret = strict_strtoul(page, 0, &tmp);
  1759 + ret = kstrtoul(page, 0, &tmp);
1760 1760 if (ret < 0) {
1761 1761 pr_err("Unable to extract alua_access_type\n");
1762   - return -EINVAL;
  1762 + return ret;
1763 1763 }
1764 1764 if ((tmp != 0) && (tmp != 1) && (tmp != 2) && (tmp != 3)) {
1765 1765 pr_err("Illegal value for alua_access_type:"
1766 1766  
... ... @@ -1794,10 +1794,10 @@
1794 1794 unsigned long tmp;
1795 1795 int ret;
1796 1796  
1797   - ret = strict_strtoul(page, 0, &tmp);
  1797 + ret = kstrtoul(page, 0, &tmp);
1798 1798 if (ret < 0) {
1799 1799 pr_err("Unable to extract nonop_delay_msecs\n");
1800   - return -EINVAL;
  1800 + return ret;
1801 1801 }
1802 1802 if (tmp > ALUA_MAX_NONOP_DELAY_MSECS) {
1803 1803 pr_err("Passed nonop_delay_msecs: %lu, exceeds"
1804 1804  
... ... @@ -1825,10 +1825,10 @@
1825 1825 unsigned long tmp;
1826 1826 int ret;
1827 1827  
1828   - ret = strict_strtoul(page, 0, &tmp);
  1828 + ret = kstrtoul(page, 0, &tmp);
1829 1829 if (ret < 0) {
1830 1830 pr_err("Unable to extract trans_delay_msecs\n");
1831   - return -EINVAL;
  1831 + return ret;
1832 1832 }
1833 1833 if (tmp > ALUA_MAX_TRANS_DELAY_MSECS) {
1834 1834 pr_err("Passed trans_delay_msecs: %lu, exceeds"
1835 1835  
... ... @@ -1856,10 +1856,10 @@
1856 1856 unsigned long tmp;
1857 1857 int ret;
1858 1858  
1859   - ret = strict_strtoul(page, 0, &tmp);
  1859 + ret = kstrtoul(page, 0, &tmp);
1860 1860 if (ret < 0) {
1861 1861 pr_err("Unable to extract implict_trans_secs\n");
1862   - return -EINVAL;
  1862 + return ret;
1863 1863 }
1864 1864 if (tmp > ALUA_MAX_IMPLICT_TRANS_SECS) {
1865 1865 pr_err("Passed implict_trans_secs: %lu, exceeds"
1866 1866  
... ... @@ -1887,10 +1887,10 @@
1887 1887 unsigned long tmp;
1888 1888 int ret;
1889 1889  
1890   - ret = strict_strtoul(page, 0, &tmp);
  1890 + ret = kstrtoul(page, 0, &tmp);
1891 1891 if (ret < 0) {
1892 1892 pr_err("Unable to extract preferred ALUA value\n");
1893   - return -EINVAL;
  1893 + return ret;
1894 1894 }
1895 1895 if ((tmp != 0) && (tmp != 1)) {
1896 1896 pr_err("Illegal value for preferred ALUA: %lu\n", tmp);
1897 1897  
... ... @@ -1922,10 +1922,10 @@
1922 1922 if (!lun->lun_sep)
1923 1923 return -ENODEV;
1924 1924  
1925   - ret = strict_strtoul(page, 0, &tmp);
  1925 + ret = kstrtoul(page, 0, &tmp);
1926 1926 if (ret < 0) {
1927 1927 pr_err("Unable to extract alua_tg_pt_offline value\n");
1928   - return -EINVAL;
  1928 + return ret;
1929 1929 }
1930 1930 if ((tmp != 0) && (tmp != 1)) {
1931 1931 pr_err("Illegal value for alua_tg_pt_offline: %lu\n",
1932 1932  
... ... @@ -1961,10 +1961,10 @@
1961 1961 unsigned long tmp;
1962 1962 int ret;
1963 1963  
1964   - ret = strict_strtoul(page, 0, &tmp);
  1964 + ret = kstrtoul(page, 0, &tmp);
1965 1965 if (ret < 0) {
1966 1966 pr_err("Unable to extract alua_tg_pt_status\n");
1967   - return -EINVAL;
  1967 + return ret;
1968 1968 }
1969 1969 if ((tmp != ALUA_STATUS_NONE) &&
1970 1970 (tmp != ALUA_STATUS_ALTERED_BY_EXPLICT_STPG) &&
1971 1971  
... ... @@ -1994,10 +1994,10 @@
1994 1994 unsigned long tmp;
1995 1995 int ret;
1996 1996  
1997   - ret = strict_strtoul(page, 0, &tmp);
  1997 + ret = kstrtoul(page, 0, &tmp);
1998 1998 if (ret < 0) {
1999 1999 pr_err("Unable to extract alua_tg_pt_write_md\n");
2000   - return -EINVAL;
  2000 + return ret;
2001 2001 }
2002 2002 if ((tmp != 0) && (tmp != 1)) {
2003 2003 pr_err("Illegal value for alua_tg_pt_write_md:"
drivers/target/target_core_configfs.c
Diff comments   View file @ 57103d7
... ... @@ -577,9 +577,9 @@
577 577 unsigned long val; \
578 578 int ret; \
579 579 \
580   - ret = strict_strtoul(page, 0, &val); \
  580 + ret = kstrtoul(page, 0, &val); \
581 581 if (ret < 0) { \
582   - pr_err("strict_strtoul() failed with" \
  582 + pr_err("kstrtoul() failed with" \
583 583 " ret: %d\n", ret); \
584 584 return -EINVAL; \
585 585 } \
586 586  
... ... @@ -1310,9 +1310,9 @@
1310 1310 ret = -ENOMEM;
1311 1311 goto out;
1312 1312 }
1313   - ret = strict_strtoull(arg_p, 0, &tmp_ll);
  1313 + ret = kstrtoull(arg_p, 0, &tmp_ll);
1314 1314 if (ret < 0) {
1315   - pr_err("strict_strtoull() failed for"
  1315 + pr_err("kstrtoull() failed for"
1316 1316 " sa_res_key=\n");
1317 1317 goto out;
1318 1318 }
1319 1319  
1320 1320  
... ... @@ -1836,11 +1836,11 @@
1836 1836 unsigned long lu_gp_id;
1837 1837 int ret;
1838 1838  
1839   - ret = strict_strtoul(page, 0, &lu_gp_id);
  1839 + ret = kstrtoul(page, 0, &lu_gp_id);
1840 1840 if (ret < 0) {
1841   - pr_err("strict_strtoul() returned %d for"
  1841 + pr_err("kstrtoul() returned %d for"
1842 1842 " lu_gp_id\n", ret);
1843   - return -EINVAL;
  1843 + return ret;
1844 1844 }
1845 1845 if (lu_gp_id > 0x0000ffff) {
1846 1846 pr_err("ALUA lu_gp_id: %lu exceeds maximum:"
1847 1847  
... ... @@ -2032,11 +2032,11 @@
2032 2032 return -EINVAL;
2033 2033 }
2034 2034  
2035   - ret = strict_strtoul(page, 0, &tmp);
  2035 + ret = kstrtoul(page, 0, &tmp);
2036 2036 if (ret < 0) {
2037 2037 pr_err("Unable to extract new ALUA access state from"
2038 2038 " %s\n", page);
2039   - return -EINVAL;
  2039 + return ret;
2040 2040 }
2041 2041 new_state = (int)tmp;
2042 2042  
2043 2043  
... ... @@ -2079,11 +2079,11 @@
2079 2079 return -EINVAL;
2080 2080 }
2081 2081  
2082   - ret = strict_strtoul(page, 0, &tmp);
  2082 + ret = kstrtoul(page, 0, &tmp);
2083 2083 if (ret < 0) {
2084 2084 pr_err("Unable to extract new ALUA access status"
2085 2085 " from %s\n", page);
2086   - return -EINVAL;
  2086 + return ret;
2087 2087 }
2088 2088 new_status = (int)tmp;
2089 2089  
2090 2090  
... ... @@ -2139,10 +2139,10 @@
2139 2139 unsigned long tmp;
2140 2140 int ret;
2141 2141  
2142   - ret = strict_strtoul(page, 0, &tmp);
  2142 + ret = kstrtoul(page, 0, &tmp);
2143 2143 if (ret < 0) {
2144 2144 pr_err("Unable to extract alua_write_metadata\n");
2145   - return -EINVAL;
  2145 + return ret;
2146 2146 }
2147 2147  
2148 2148 if ((tmp != 0) && (tmp != 1)) {
2149 2149  
2150 2150  
... ... @@ -2263,11 +2263,11 @@
2263 2263 unsigned long tg_pt_gp_id;
2264 2264 int ret;
2265 2265  
2266   - ret = strict_strtoul(page, 0, &tg_pt_gp_id);
  2266 + ret = kstrtoul(page, 0, &tg_pt_gp_id);
2267 2267 if (ret < 0) {
2268   - pr_err("strict_strtoul() returned %d for"
  2268 + pr_err("kstrtoul() returned %d for"
2269 2269 " tg_pt_gp_id\n", ret);
2270   - return -EINVAL;
  2270 + return ret;
2271 2271 }
2272 2272 if (tg_pt_gp_id > 0x0000ffff) {
2273 2273 pr_err("ALUA tg_pt_gp_id: %lu exceeds maximum:"
2274 2274  
... ... @@ -2676,10 +2676,10 @@
2676 2676 if (transport->pmode_enable_hba == NULL)
2677 2677 return -EINVAL;
2678 2678  
2679   - ret = strict_strtoul(page, 0, &mode_flag);
  2679 + ret = kstrtoul(page, 0, &mode_flag);
2680 2680 if (ret < 0) {
2681 2681 pr_err("Unable to extract hba mode flag: %d\n", ret);
2682   - return -EINVAL;
  2682 + return ret;
2683 2683 }
2684 2684  
2685 2685 if (hba->dev_count) {
2686 2686  
2687 2687  
... ... @@ -2767,11 +2767,11 @@
2767 2767 str++; /* Skip to start of plugin dependent ID */
2768 2768 }
2769 2769  
2770   - ret = strict_strtoul(str, 0, &plugin_dep_id);
  2770 + ret = kstrtoul(str, 0, &plugin_dep_id);
2771 2771 if (ret < 0) {
2772   - pr_err("strict_strtoul() returned %d for"
  2772 + pr_err("kstrtoul() returned %d for"
2773 2773 " plugin_dep_id\n", ret);
2774   - return ERR_PTR(-EINVAL);
  2774 + return ERR_PTR(ret);
2775 2775 }
2776 2776 /*
2777 2777 * Load up TCM subsystem plugins if they have not already been loaded.
drivers/target/target_core_fabric_configfs.c
Diff comments   View file @ 57103d7
... ... @@ -189,9 +189,11 @@
189 189 struct se_node_acl *se_nacl = lacl->se_lun_nacl;
190 190 struct se_portal_group *se_tpg = se_nacl->se_tpg;
191 191 unsigned long op;
  192 + int ret;
192 193  
193   - if (strict_strtoul(page, 0, &op))
194   - return -EINVAL;
  194 + ret = kstrtoul(page, 0, &op);
  195 + if (ret)
  196 + return ret;
195 197  
196 198 if ((op != 1) && (op != 0))
197 199 return -EINVAL;
... ... @@ -350,7 +352,10 @@
350 352 * Determine the Mapped LUN value. This is what the SCSI Initiator
351 353 * Port will actually see.
352 354 */
353   - if (strict_strtoul(buf + 4, 0, &mapped_lun) || mapped_lun > UINT_MAX) {
  355 + ret = kstrtoul(buf + 4, 0, &mapped_lun);
  356 + if (ret)
  357 + goto out;
  358 + if (mapped_lun > UINT_MAX) {
354 359 ret = -EINVAL;
355 360 goto out;
356 361 }
... ... @@ -875,7 +880,10 @@
875 880 " \"lun_$LUN_NUMBER\"\n");
876 881 return ERR_PTR(-EINVAL);
877 882 }
878   - if (strict_strtoul(name + 4, 0, &unpacked_lun) || unpacked_lun > UINT_MAX)
  883 + errno = kstrtoul(name + 4, 0, &unpacked_lun);
  884 + if (errno)
  885 + return ERR_PTR(errno);
  886 + if (unpacked_lun > UINT_MAX)
879 887 return ERR_PTR(-EINVAL);
880 888  
881 889 lun = core_get_lun_from_tpg(se_tpg, unpacked_lun);
drivers/target/target_core_file.c
Diff comments   View file @ 57103d7
... ... @@ -635,10 +635,10 @@
635 635 ret = -ENOMEM;
636 636 break;
637 637 }
638   - ret = strict_strtoull(arg_p, 0, &fd_dev->fd_dev_size);
  638 + ret = kstrtoull(arg_p, 0, &fd_dev->fd_dev_size);
639 639 kfree(arg_p);
640 640 if (ret < 0) {
641   - pr_err("strict_strtoull() failed for"
  641 + pr_err("kstrtoull() failed for"
642 642 " fd_dev_size=\n");
643 643 goto out;
644 644 }
drivers/target/target_core_iblock.c
Diff comments   View file @ 57103d7
... ... @@ -536,10 +536,10 @@
536 536 ret = -ENOMEM;
537 537 break;
538 538 }
539   - ret = strict_strtoul(arg_p, 0, &tmp_readonly);
  539 + ret = kstrtoul(arg_p, 0, &tmp_readonly);
540 540 kfree(arg_p);
541 541 if (ret < 0) {
542   - pr_err("strict_strtoul() failed for"
  542 + pr_err("kstrtoul() failed for"
543 543 " readonly=\n");
544 544 goto out;
545 545 }
drivers/target/tcm_fc/tfc_conf.c
Diff comments   View file @ 57103d7
... ... @@ -311,7 +311,11 @@
311 311 */
312 312 if (strstr(name, "tpgt_") != name)
313 313 return NULL;
314   - if (strict_strtoul(name + 5, 10, &index) || index > UINT_MAX)
  314 +
  315 + ret = kstrtoul(name + 5, 10, &index);
  316 + if (ret)
  317 + return NULL;
  318 + if (index > UINT_MAX)
315 319 return NULL;
316 320  
317 321 lacl = container_of(wwn, struct ft_lport_acl, fc_lport_wwn);