diff options
author | Hannes Reinecke <hare@suse.de> | 2015-06-10 02:41:22 -0400 |
---|---|---|
committer | Nicholas Bellinger <nab@linux-iscsi.org> | 2015-06-16 02:26:01 -0400 |
commit | f2d30680204f20b815e6796437923fb870b6c193 (patch) | |
tree | eef624a98fedcacf850c1e53bfe68720a7b0bdc4 /drivers/target/target_core_configfs.c | |
parent | e34d366273ce17bba902975f7c1e64a24a399024 (diff) |
target: use 64-bit LUNs
As we're now using a list to hold the LUNs the target core
can now converted to use 64-bit LUNs internally.
Signed-off-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
Diffstat (limited to 'drivers/target/target_core_configfs.c')
-rw-r--r-- | drivers/target/target_core_configfs.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/target/target_core_configfs.c b/drivers/target/target_core_configfs.c index f97b969e6714..68addbc7eb7b 100644 --- a/drivers/target/target_core_configfs.c +++ b/drivers/target/target_core_configfs.c | |||
@@ -1438,7 +1438,7 @@ static ssize_t target_core_dev_pr_show_attr_res_pr_holder_tg_port( | |||
1438 | tfo->tpg_get_wwn(se_tpg)); | 1438 | tfo->tpg_get_wwn(se_tpg)); |
1439 | len += sprintf(page+len, "SPC-3 Reservation: Relative Port" | 1439 | len += sprintf(page+len, "SPC-3 Reservation: Relative Port" |
1440 | " Identifier Tag: %hu %s Portal Group Tag: %hu" | 1440 | " Identifier Tag: %hu %s Portal Group Tag: %hu" |
1441 | " %s Logical Unit: %u\n", pr_reg->tg_pt_sep_rtpi, | 1441 | " %s Logical Unit: %llu\n", pr_reg->tg_pt_sep_rtpi, |
1442 | tfo->get_fabric_name(), tfo->tpg_get_tag(se_tpg), | 1442 | tfo->get_fabric_name(), tfo->tpg_get_tag(se_tpg), |
1443 | tfo->get_fabric_name(), pr_reg->pr_aptpl_target_lun); | 1443 | tfo->get_fabric_name(), pr_reg->pr_aptpl_target_lun); |
1444 | 1444 | ||
@@ -1565,12 +1565,12 @@ static match_table_t tokens = { | |||
1565 | {Opt_res_type, "res_type=%d"}, | 1565 | {Opt_res_type, "res_type=%d"}, |
1566 | {Opt_res_scope, "res_scope=%d"}, | 1566 | {Opt_res_scope, "res_scope=%d"}, |
1567 | {Opt_res_all_tg_pt, "res_all_tg_pt=%d"}, | 1567 | {Opt_res_all_tg_pt, "res_all_tg_pt=%d"}, |
1568 | {Opt_mapped_lun, "mapped_lun=%d"}, | 1568 | {Opt_mapped_lun, "mapped_lun=%lld"}, |
1569 | {Opt_target_fabric, "target_fabric=%s"}, | 1569 | {Opt_target_fabric, "target_fabric=%s"}, |
1570 | {Opt_target_node, "target_node=%s"}, | 1570 | {Opt_target_node, "target_node=%s"}, |
1571 | {Opt_tpgt, "tpgt=%d"}, | 1571 | {Opt_tpgt, "tpgt=%d"}, |
1572 | {Opt_port_rtpi, "port_rtpi=%d"}, | 1572 | {Opt_port_rtpi, "port_rtpi=%d"}, |
1573 | {Opt_target_lun, "target_lun=%d"}, | 1573 | {Opt_target_lun, "target_lun=%lld"}, |
1574 | {Opt_err, NULL} | 1574 | {Opt_err, NULL} |
1575 | }; | 1575 | }; |
1576 | 1576 | ||
@@ -1585,7 +1585,7 @@ static ssize_t target_core_dev_pr_store_attr_res_aptpl_metadata( | |||
1585 | substring_t args[MAX_OPT_ARGS]; | 1585 | substring_t args[MAX_OPT_ARGS]; |
1586 | unsigned long long tmp_ll; | 1586 | unsigned long long tmp_ll; |
1587 | u64 sa_res_key = 0; | 1587 | u64 sa_res_key = 0; |
1588 | u32 mapped_lun = 0, target_lun = 0; | 1588 | u64 mapped_lun = 0, target_lun = 0; |
1589 | int ret = -1, res_holder = 0, all_tg_pt = 0, arg, token; | 1589 | int ret = -1, res_holder = 0, all_tg_pt = 0, arg, token; |
1590 | u16 tpgt = 0; | 1590 | u16 tpgt = 0; |
1591 | u8 type = 0; | 1591 | u8 type = 0; |
@@ -1675,7 +1675,7 @@ static ssize_t target_core_dev_pr_store_attr_res_aptpl_metadata( | |||
1675 | break; | 1675 | break; |
1676 | case Opt_mapped_lun: | 1676 | case Opt_mapped_lun: |
1677 | match_int(args, &arg); | 1677 | match_int(args, &arg); |
1678 | mapped_lun = (u32)arg; | 1678 | mapped_lun = (u64)arg; |
1679 | break; | 1679 | break; |
1680 | /* | 1680 | /* |
1681 | * PR APTPL Metadata for Target Port | 1681 | * PR APTPL Metadata for Target Port |
@@ -1710,7 +1710,7 @@ static ssize_t target_core_dev_pr_store_attr_res_aptpl_metadata( | |||
1710 | break; | 1710 | break; |
1711 | case Opt_target_lun: | 1711 | case Opt_target_lun: |
1712 | match_int(args, &arg); | 1712 | match_int(args, &arg); |
1713 | target_lun = (u32)arg; | 1713 | target_lun = (u64)arg; |
1714 | break; | 1714 | break; |
1715 | default: | 1715 | default: |
1716 | break; | 1716 | break; |