tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending

Pull SCSI target fixes from Nicholas Bellinger:
"Just a few small fixes:

Two from Andy, the first addresses a v4.0 target specific regression
to a user visible configfs attribute, and the second adds a set of
missing brackets around IPv6 discovery portal information within
iscsi-target.

And one from Mike that fixes an OOPs regression in traditional
iscsi-target when an iovec allocation fails, that has been present
since v3.10.y code. (CC'd to stable)"

* git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:
iscsi target: fix oops when adding reject pdu
iscsi-target: TargetAddress in SendTargets should bracket ipv6 addresses
target: Allow userspace to write 1 to attrib/emulate_fua_write

Linus Torvalds 49850a14 cfc4957b

+10 -5
+8 -3
drivers/target/iscsi/iscsi_target.c
··· 1181 1181 * traditional iSCSI block I/O. 1182 1182 */ 1183 1183 if (iscsit_allocate_iovecs(cmd) < 0) { 1184 - return iscsit_add_reject_cmd(cmd, 1184 + return iscsit_reject_cmd(cmd, 1185 1185 ISCSI_REASON_BOOKMARK_NO_RESOURCES, buf); 1186 1186 } 1187 1187 immed_data = cmd->immediate_data; ··· 3468 3468 tpg_np_list) { 3469 3469 struct iscsi_np *np = tpg_np->tpg_np; 3470 3470 bool inaddr_any = iscsit_check_inaddr_any(np); 3471 + char *fmt_str; 3471 3472 3472 3473 if (np->np_network_transport != network_transport) 3473 3474 continue; ··· 3496 3495 } 3497 3496 } 3498 3497 3499 - len = sprintf(buf, "TargetAddress=" 3500 - "%s:%hu,%hu", 3498 + if (np->np_sockaddr.ss_family == AF_INET6) 3499 + fmt_str = "TargetAddress=[%s]:%hu,%hu"; 3500 + else 3501 + fmt_str = "TargetAddress=%s:%hu,%hu"; 3502 + 3503 + len = sprintf(buf, fmt_str, 3501 3504 inaddr_any ? conn->local_ip : np->np_ip, 3502 3505 np->np_port, 3503 3506 tpg->tpgt);
+2 -2
drivers/target/target_core_device.c
··· 781 781 } 782 782 if (flag && 783 783 dev->transport->get_write_cache) { 784 - pr_err("emulate_fua_write not supported for this device\n"); 785 - return -EINVAL; 784 + pr_warn("emulate_fua_write not supported for this device, ignoring\n"); 785 + return 0; 786 786 } 787 787 if (dev->export_count) { 788 788 pr_err("emulate_fua_write cannot be changed with active"