Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4ba3069f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending 

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: (26 commits)
  target: Set additional sense length field in sense data
  target: Remove legacy device status check from transport_execute_tasks
  target: Remove __transport_execute_tasks() for each processing context
  target: Remove extra se_device->execute_task_lock access in fast path
  target: Drop se_device TCQ queue_depth usage from I/O path
  target: Fix possible NULL pointer with __transport_execute_tasks
  target: Remove TFO->check_release_cmd() fabric API caller
  tcm_fc: Convert ft_send_work to use target_submit_cmd
  target: Add target_submit_cmd() for process context fabric submission
  target: Make target_put_sess_cmd use target_release_cmd_kref
  target: Set response format in INQUIRY response
  target: tcm_mod_builder: small fixups
  Documentation/target: Fix tcm_mod_builder.py build breakage
  target: remove overagressive ____cacheline_aligned annoations
  tcm_loop: bump max_sectors
  target/configs: remove trailing newline from udev_path and alias
  iscsi-target: fix chap identifier simple_strtoul usage
  target: remove useless casts
  target: simplify target_check_cdb_and_preempt
  target: Move core_scsi3_check_cdb_abort_and_preempt
  ...
parents 507a03c1 895f3022

Documentation/target/tcm_mod_builder.py

+15 −45
Original line number Diff line number Diff line
@@ -230,14 +230,9 @@ def tcm_mod_build_configfs(proto_ident, fabric_mod_dir_var, fabric_mod_name): 
	buf += "#include <linux/ctype.h>\n"

	buf += "#include <asm/unaligned.h>\n\n"

	buf += "#include <target/target_core_base.h>\n"

	buf += "#include <target/target_core_transport.h>\n"

	buf += "#include <target/target_core_fabric_ops.h>\n"

	buf += "#include <target/target_core_fabric.h>\n"

	buf += "#include <target/target_core_fabric_configfs.h>\n"

	buf += "#include <target/target_core_fabric_lib.h>\n"

	buf += "#include <target/target_core_device.h>\n"

	buf += "#include <target/target_core_tpg.h>\n"

	buf += "#include <target/target_core_configfs.h>\n"

	buf += "#include <target/target_core_base.h>\n"

	buf += "#include <target/configfs_macros.h>\n\n"

	buf += "#include \"" + fabric_mod_name + "_base.h\"\n"

	buf += "#include \"" + fabric_mod_name + "_fabric.h\"\n\n"
@@ -260,7 +255,7 @@ def tcm_mod_build_configfs(proto_ident, fabric_mod_dir_var, fabric_mod_name): 
	buf += "	/* " + fabric_mod_name + "_parse_wwn(name, &wwpn, 1) < 0)\n"

	buf += "		return ERR_PTR(-EINVAL); */\n"

	buf += "	se_nacl_new = " + fabric_mod_name + "_alloc_fabric_acl(se_tpg);\n"

	buf += "	if (!(se_nacl_new))\n"

	buf += "	if (!se_nacl_new)\n"

	buf += "		return ERR_PTR(-ENOMEM);\n"

	buf += "//#warning FIXME: Hardcoded nexus depth in " + fabric_mod_name + "_make_nodeacl()\n"

	buf += "	nexus_depth = 1;\n"
@@ -308,7 +303,7 @@ def tcm_mod_build_configfs(proto_ident, fabric_mod_dir_var, fabric_mod_name): 
	buf += "	if (strict_strtoul(name + 5, 10, &tpgt) || tpgt > UINT_MAX)\n"

	buf += "		return ERR_PTR(-EINVAL);\n\n"

	buf += "	tpg = kzalloc(sizeof(struct " + fabric_mod_name + "_tpg), GFP_KERNEL);\n"

	buf += "	if (!(tpg)) {\n"

	buf += "	if (!tpg) {\n"

	buf += "		printk(KERN_ERR \"Unable to allocate struct " + fabric_mod_name + "_tpg\");\n"

	buf += "		return ERR_PTR(-ENOMEM);\n"

	buf += "	}\n"
@@ -344,7 +339,7 @@ def tcm_mod_build_configfs(proto_ident, fabric_mod_dir_var, fabric_mod_name): 
	buf += "	/* if (" + fabric_mod_name + "_parse_wwn(name, &wwpn, 1) < 0)\n"

	buf += "		return ERR_PTR(-EINVAL); */\n\n"

	buf += "	" + fabric_mod_port + " = kzalloc(sizeof(struct " + fabric_mod_name + "_" + fabric_mod_port + "), GFP_KERNEL);\n"

	buf += "	if (!(" + fabric_mod_port + ")) {\n"

	buf += "	if (!" + fabric_mod_port + ") {\n"

	buf += "		printk(KERN_ERR \"Unable to allocate struct " + fabric_mod_name + "_" + fabric_mod_port + "\");\n"

	buf += "		return ERR_PTR(-ENOMEM);\n"

	buf += "	}\n"
@@ -352,7 +347,7 @@ def tcm_mod_build_configfs(proto_ident, fabric_mod_dir_var, fabric_mod_name): 
	if proto_ident == "FC" or proto_ident == "SAS":

		buf += "	" + fabric_mod_port + "->" + fabric_mod_port + "_wwpn = wwpn;\n"



	buf += "	/* " + fabric_mod_name + "_format_wwn(&" + fabric_mod_port + "->" + fabric_mod_port + "_name[0], " + fabric_mod_name.upper() + "__NAMELEN, wwpn); */\n\n"

	buf += "	/* " + fabric_mod_name + "_format_wwn(&" + fabric_mod_port + "->" + fabric_mod_port + "_name[0], " + fabric_mod_name.upper() + "_NAMELEN, wwpn); */\n\n"

	buf += "	return &" + fabric_mod_port + "->" + fabric_mod_port + "_wwn;\n"

	buf += "}\n\n"

	buf += "static void " + fabric_mod_name + "_drop_" + fabric_mod_port + "(struct se_wwn *wwn)\n"
@@ -391,8 +386,7 @@ def tcm_mod_build_configfs(proto_ident, fabric_mod_dir_var, fabric_mod_name): 
	buf += "	.tpg_alloc_fabric_acl		= " + fabric_mod_name + "_alloc_fabric_acl,\n"

	buf += "	.tpg_release_fabric_acl		= " + fabric_mod_name + "_release_fabric_acl,\n"

	buf += "	.tpg_get_inst_index		= " + fabric_mod_name + "_tpg_get_inst_index,\n"

	buf += "	.release_cmd_to_pool		= " + fabric_mod_name + "_release_cmd,\n"

	buf += "	.release_cmd_direct		= " + fabric_mod_name + "_release_cmd,\n"

	buf += "	.release_cmd			= " + fabric_mod_name + "_release_cmd,\n"

	buf += "	.shutdown_session		= " + fabric_mod_name + "_shutdown_session,\n"

	buf += "	.close_session			= " + fabric_mod_name + "_close_session,\n"

	buf += "	.stop_session			= " + fabric_mod_name + "_stop_session,\n"
@@ -405,14 +399,12 @@ def tcm_mod_build_configfs(proto_ident, fabric_mod_dir_var, fabric_mod_name): 
	buf += "	.set_default_node_attributes	= " + fabric_mod_name + "_set_default_node_attrs,\n"

	buf += "	.get_task_tag			= " + fabric_mod_name + "_get_task_tag,\n"

	buf += "	.get_cmd_state			= " + fabric_mod_name + "_get_cmd_state,\n"

	buf += "	.new_cmd_failure		= " + fabric_mod_name + "_new_cmd_failure,\n"

	buf += "	.queue_data_in			= " + fabric_mod_name + "_queue_data_in,\n"

	buf += "	.queue_status			= " + fabric_mod_name + "_queue_status,\n"

	buf += "	.queue_tm_rsp			= " + fabric_mod_name + "_queue_tm_rsp,\n"

	buf += "	.get_fabric_sense_len		= " + fabric_mod_name + "_get_fabric_sense_len,\n"

	buf += "	.set_fabric_sense_len		= " + fabric_mod_name + "_set_fabric_sense_len,\n"

	buf += "	.is_state_remove		= " + fabric_mod_name + "_is_state_remove,\n"

	buf += "	.pack_lun			= " + fabric_mod_name + "_pack_lun,\n"

	buf += "	/*\n"

	buf += "	 * Setup function pointers for generic logic in target_core_fabric_configfs.c\n"

	buf += "	 */\n"
@@ -439,9 +431,9 @@ def tcm_mod_build_configfs(proto_ident, fabric_mod_dir_var, fabric_mod_name): 
	buf += "	 * Register the top level struct config_item_type with TCM core\n"

	buf += "	 */\n"

	buf += "	fabric = target_fabric_configfs_init(THIS_MODULE, \"" + fabric_mod_name[4:] + "\");\n"

	buf += "	if (!(fabric)) {\n"

	buf += "	if (IS_ERR(fabric)) {\n"

	buf += "		printk(KERN_ERR \"target_fabric_configfs_init() failed\\n\");\n"

	buf += "		return -ENOMEM;\n"

	buf += "		return PTR_ERR(fabric);\n"

	buf += "	}\n"

	buf += "	/*\n"

	buf += "	 * Setup fabric->tf_ops from our local " + fabric_mod_name + "_ops\n"
@@ -475,9 +467,9 @@ def tcm_mod_build_configfs(proto_ident, fabric_mod_dir_var, fabric_mod_name): 
	buf += "	printk(KERN_INFO \"" +  fabric_mod_name.upper() + "[0] - Set fabric -> " + fabric_mod_name + "_fabric_configfs\\n\");\n"

	buf += "	return 0;\n"

	buf += "};\n\n"

	buf += "static void " + fabric_mod_name + "_deregister_configfs(void)\n"

	buf += "static void __exit " + fabric_mod_name + "_deregister_configfs(void)\n"

	buf += "{\n"

	buf += "	if (!(" + fabric_mod_name + "_fabric_configfs))\n"

	buf += "	if (!" + fabric_mod_name + "_fabric_configfs)\n"

	buf += "		return;\n\n"

	buf += "	target_fabric_configfs_deregister(" + fabric_mod_name + "_fabric_configfs);\n"

	buf += "	" + fabric_mod_name + "_fabric_configfs = NULL;\n"
@@ -492,17 +484,15 @@ def tcm_mod_build_configfs(proto_ident, fabric_mod_dir_var, fabric_mod_name): 
	buf += "		return ret;\n\n"

	buf += "	return 0;\n"

	buf += "};\n\n"

	buf += "static void " + fabric_mod_name + "_exit(void)\n"

	buf += "static void __exit " + fabric_mod_name + "_exit(void)\n"

	buf += "{\n"

	buf += "	" + fabric_mod_name + "_deregister_configfs();\n"

	buf += "};\n\n"



	buf += "#ifdef MODULE\n"

	buf += "MODULE_DESCRIPTION(\"" + fabric_mod_name.upper() + " series fabric driver\");\n"

	buf += "MODULE_LICENSE(\"GPL\");\n"

	buf += "module_init(" + fabric_mod_name + "_init);\n"

	buf += "module_exit(" + fabric_mod_name + "_exit);\n"

	buf += "#endif\n"



	ret = p.write(buf)

	if ret:
@@ -514,7 +504,7 @@ def tcm_mod_build_configfs(proto_ident, fabric_mod_dir_var, fabric_mod_name): 


def tcm_mod_scan_fabric_ops(tcm_dir):



	fabric_ops_api = tcm_dir + "include/target/target_core_fabric_ops.h"

	fabric_ops_api = tcm_dir + "include/target/target_core_fabric.h"



	print "Using tcm_mod_scan_fabric_ops: " + fabric_ops_api

	process_fo = 0;
@@ -579,11 +569,7 @@ def tcm_mod_dump_fabric_ops(proto_ident, fabric_mod_dir_var, fabric_mod_name): 
	buf += "#include <scsi/scsi_cmnd.h>\n"

	buf += "#include <scsi/libfc.h>\n\n"

	buf += "#include <target/target_core_base.h>\n"

	buf += "#include <target/target_core_transport.h>\n"

	buf += "#include <target/target_core_fabric_ops.h>\n"

	buf += "#include <target/target_core_fabric_lib.h>\n"

	buf += "#include <target/target_core_device.h>\n"

	buf += "#include <target/target_core_tpg.h>\n"

	buf += "#include <target/target_core_fabric.h>\n"

	buf += "#include <target/target_core_configfs.h>\n\n"

	buf += "#include \"" + fabric_mod_name + "_base.h\"\n"

	buf += "#include \"" + fabric_mod_name + "_fabric.h\"\n\n"
@@ -788,7 +774,7 @@ def tcm_mod_dump_fabric_ops(proto_ident, fabric_mod_dir_var, fabric_mod_name): 
			buf += "{\n"

			buf += "	struct " + fabric_mod_name + "_nacl *nacl;\n\n"

			buf += "	nacl = kzalloc(sizeof(struct " + fabric_mod_name + "_nacl), GFP_KERNEL);\n"

			buf += "	if (!(nacl)) {\n"

			buf += "	if (!nacl) {\n"

			buf += "		printk(KERN_ERR \"Unable to alocate struct " + fabric_mod_name + "_nacl\\n\");\n"

			buf += "		return NULL;\n"

			buf += "	}\n\n"
@@ -815,7 +801,7 @@ def tcm_mod_dump_fabric_ops(proto_ident, fabric_mod_dir_var, fabric_mod_name): 
			buf += "}\n\n"

			bufi += "u32 " + fabric_mod_name + "_tpg_get_inst_index(struct se_portal_group *);\n"



		if re.search('release_cmd_to_pool', fo):

		if re.search('\*release_cmd\)\(', fo):

			buf += "void " + fabric_mod_name + "_release_cmd(struct se_cmd *se_cmd)\n"

			buf += "{\n"

			buf += "	return;\n"
@@ -899,13 +885,6 @@ def tcm_mod_dump_fabric_ops(proto_ident, fabric_mod_dir_var, fabric_mod_name): 
			buf += "}\n\n"

			bufi += "int " + fabric_mod_name + "_get_cmd_state(struct se_cmd *);\n"



		if re.search('new_cmd_failure\)\(', fo):

			buf += "void " + fabric_mod_name + "_new_cmd_failure(struct se_cmd *se_cmd)\n"

			buf += "{\n"

			buf += "	return;\n"

			buf += "}\n\n"

			bufi += "void " + fabric_mod_name + "_new_cmd_failure(struct se_cmd *);\n"



		if re.search('queue_data_in\)\(', fo):

			buf += "int " + fabric_mod_name + "_queue_data_in(struct se_cmd *se_cmd)\n"

			buf += "{\n"
@@ -948,15 +927,6 @@ def tcm_mod_dump_fabric_ops(proto_ident, fabric_mod_dir_var, fabric_mod_name): 
			buf += "}\n\n"

			bufi += "int " + fabric_mod_name + "_is_state_remove(struct se_cmd *);\n"



		if re.search('pack_lun\)\(', fo):

			buf += "u64 " + fabric_mod_name + "_pack_lun(unsigned int lun)\n"

			buf += "{\n"

			buf += "	WARN_ON(lun >= 256);\n"

			buf += "	/* Caller wants this byte-swapped */\n"

			buf += "	return cpu_to_le64((lun & 0xff) << 8);\n"

			buf += "}\n\n"

			bufi += "u64 " + fabric_mod_name + "_pack_lun(unsigned int);\n"





	ret = p.write(buf)

	if ret:

drivers/target/iscsi/iscsi_target.c

+9 −10
Original line number Diff line number Diff line
@@ -27,8 +27,7 @@ 
#include <scsi/scsi_device.h>

#include <scsi/iscsi_proto.h>

#include <target/target_core_base.h>

#include <target/target_core_tmr.h>

#include <target/target_core_transport.h>

#include <target/target_core_fabric.h>



#include "iscsi_target_core.h"

#include "iscsi_target_parameters.h"
@@ -284,8 +283,8 @@ static struct iscsi_np *iscsit_get_np( 
			sock_in6 = (struct sockaddr_in6 *)sockaddr;

			sock_in6_e = (struct sockaddr_in6 *)&np->np_sockaddr;



			if (!memcmp((void *)&sock_in6->sin6_addr.in6_u,

				    (void *)&sock_in6_e->sin6_addr.in6_u,

			if (!memcmp(&sock_in6->sin6_addr.in6_u,

				    &sock_in6_e->sin6_addr.in6_u,

				    sizeof(struct in6_addr)))

				ip_match = 1;
@@ -1225,7 +1224,7 @@ static void iscsit_do_crypto_hash_buf( 


	crypto_hash_init(hash);



	sg_init_one(&sg, (u8 *)buf, payload_length);

	sg_init_one(&sg, buf, payload_length);

	crypto_hash_update(hash, &sg, payload_length);



	if (padding) {
@@ -1603,7 +1602,7 @@ static int iscsit_handle_nop_out( 
		/*

		 * Attach ping data to struct iscsi_cmd->buf_ptr.

		 */

		cmd->buf_ptr = (void *)ping_data;

		cmd->buf_ptr = ping_data;

		cmd->buf_ptr_size = payload_length;



		pr_debug("Got %u bytes of NOPOUT ping"
@@ -3197,7 +3196,7 @@ static int iscsit_build_sendtargets_response(struct iscsi_cmd *cmd) 
			end_of_buf = 1;

			goto eob;

		}

		memcpy((void *)payload + payload_len, buf, len);

		memcpy(payload + payload_len, buf, len);

		payload_len += len;



		spin_lock(&tiqn->tiqn_tpg_lock);
@@ -3229,7 +3228,7 @@ static int iscsit_build_sendtargets_response(struct iscsi_cmd *cmd) 
					end_of_buf = 1;

					goto eob;

				}

				memcpy((void *)payload + payload_len, buf, len);

				memcpy(payload + payload_len, buf, len);

				payload_len += len;

			}

			spin_unlock(&tpg->tpg_np_lock);
@@ -3486,7 +3485,7 @@ int iscsi_target_tx_thread(void *arg) 
	struct iscsi_conn *conn;

	struct iscsi_queue_req *qr = NULL;

	struct se_cmd *se_cmd;

	struct iscsi_thread_set *ts = (struct iscsi_thread_set *)arg;

	struct iscsi_thread_set *ts = arg;

	/*

	 * Allow ourselves to be interrupted by SIGINT so that a

	 * connection recovery / failure event can be triggered externally.
@@ -3775,7 +3774,7 @@ int iscsi_target_rx_thread(void *arg) 
	u8 buffer[ISCSI_HDR_LEN], opcode;

	u32 checksum = 0, digest = 0;

	struct iscsi_conn *conn = NULL;

	struct iscsi_thread_set *ts = (struct iscsi_thread_set *)arg;

	struct iscsi_thread_set *ts = arg;

	struct kvec iov;

	/*

	 * Allow ourselves to be interrupted by SIGINT so that a

drivers/target/iscsi/iscsi_target_auth.c

+20 −16
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ static void chap_gen_challenge( 
	unsigned int *c_len)

{

	unsigned char challenge_asciihex[CHAP_CHALLENGE_LENGTH * 2 + 1];

	struct iscsi_chap *chap = (struct iscsi_chap *) conn->auth_protocol;

	struct iscsi_chap *chap = conn->auth_protocol;



	memset(challenge_asciihex, 0, CHAP_CHALLENGE_LENGTH * 2 + 1);
@@ -120,7 +120,7 @@ static struct iscsi_chap *chap_server_open( 
	if (!conn->auth_protocol)

		return NULL;



	chap = (struct iscsi_chap *) conn->auth_protocol;

	chap = conn->auth_protocol;

	/*

	 * We only support MD5 MDA presently.

	 */
@@ -165,14 +165,15 @@ static int chap_server_compute_md5( 
	unsigned int *nr_out_len)

{

	char *endptr;

	unsigned char id, digest[MD5_SIGNATURE_SIZE];

	unsigned long id;

	unsigned char digest[MD5_SIGNATURE_SIZE];

	unsigned char type, response[MD5_SIGNATURE_SIZE * 2 + 2];

	unsigned char identifier[10], *challenge = NULL;

	unsigned char *challenge_binhex = NULL;

	unsigned char client_digest[MD5_SIGNATURE_SIZE];

	unsigned char server_digest[MD5_SIGNATURE_SIZE];

	unsigned char chap_n[MAX_CHAP_N_SIZE], chap_r[MAX_RESPONSE_LENGTH];

	struct iscsi_chap *chap = (struct iscsi_chap *) conn->auth_protocol;

	struct iscsi_chap *chap = conn->auth_protocol;

	struct crypto_hash *tfm;

	struct hash_desc desc;

	struct scatterlist sg;
@@ -246,7 +247,7 @@ static int chap_server_compute_md5( 
		goto out;

	}



	sg_init_one(&sg, (void *)&chap->id, 1);

	sg_init_one(&sg, &chap->id, 1);

	ret = crypto_hash_update(&desc, &sg, 1);

	if (ret < 0) {

		pr_err("crypto_hash_update() failed for id\n");
@@ -254,7 +255,7 @@ static int chap_server_compute_md5( 
		goto out;

	}



	sg_init_one(&sg, (void *)&auth->password, strlen(auth->password));

	sg_init_one(&sg, &auth->password, strlen(auth->password));

	ret = crypto_hash_update(&desc, &sg, strlen(auth->password));

	if (ret < 0) {

		pr_err("crypto_hash_update() failed for password\n");
@@ -262,7 +263,7 @@ static int chap_server_compute_md5( 
		goto out;

	}



	sg_init_one(&sg, (void *)chap->challenge, CHAP_CHALLENGE_LENGTH);

	sg_init_one(&sg, chap->challenge, CHAP_CHALLENGE_LENGTH);

	ret = crypto_hash_update(&desc, &sg, CHAP_CHALLENGE_LENGTH);

	if (ret < 0) {

		pr_err("crypto_hash_update() failed for challenge\n");
@@ -305,14 +306,17 @@ static int chap_server_compute_md5( 
	}



	if (type == HEX)

		id = (unsigned char)simple_strtoul((char *)&identifier[2],

					&endptr, 0);

		id = simple_strtoul(&identifier[2], &endptr, 0);

	else

		id = (unsigned char)simple_strtoul(identifier, &endptr, 0);

		id = simple_strtoul(identifier, &endptr, 0);

	if (id > 255) {

		pr_err("chap identifier: %lu greater than 255\n", id);

		goto out;

	}

	/*

	 * RFC 1994 says Identifier is no more than octet (8 bits).

	 */

	pr_debug("[server] Got CHAP_I=%d\n", id);

	pr_debug("[server] Got CHAP_I=%lu\n", id);

	/*

	 * Get CHAP_C.

	 */
@@ -351,7 +355,7 @@ static int chap_server_compute_md5( 
		goto out;

	}



	sg_init_one(&sg, (void *)&id, 1);

	sg_init_one(&sg, &id, 1);

	ret = crypto_hash_update(&desc, &sg, 1);

	if (ret < 0) {

		pr_err("crypto_hash_update() failed for id\n");
@@ -359,7 +363,7 @@ static int chap_server_compute_md5( 
		goto out;

	}



	sg_init_one(&sg, (void *)auth->password_mutual,

	sg_init_one(&sg, auth->password_mutual,

				strlen(auth->password_mutual));

	ret = crypto_hash_update(&desc, &sg, strlen(auth->password_mutual));

	if (ret < 0) {
@@ -371,7 +375,7 @@ static int chap_server_compute_md5( 
	/*

	 * Convert received challenge to binary hex.

	 */

	sg_init_one(&sg, (void *)challenge_binhex, challenge_len);

	sg_init_one(&sg, challenge_binhex, challenge_len);

	ret = crypto_hash_update(&desc, &sg, challenge_len);

	if (ret < 0) {

		pr_err("crypto_hash_update() failed for ma challenge\n");
@@ -414,7 +418,7 @@ static int chap_got_response( 
	char *nr_out_ptr,

	unsigned int *nr_out_len)

{

	struct iscsi_chap *chap = (struct iscsi_chap *) conn->auth_protocol;

	struct iscsi_chap *chap = conn->auth_protocol;



	switch (chap->digest_type) {

	case CHAP_DIGEST_MD5:
@@ -437,7 +441,7 @@ u32 chap_main_loop( 
	int *in_len,

	int *out_len)

{

	struct iscsi_chap *chap = (struct iscsi_chap *) conn->auth_protocol;

	struct iscsi_chap *chap = conn->auth_protocol;



	if (!chap) {

		chap = chap_server_open(conn, auth, in_text, out_text, out_len);

drivers/target/iscsi/iscsi_target_configfs.c

+3 −8
Original line number Diff line number Diff line
@@ -22,12 +22,8 @@ 
#include <linux/configfs.h>

#include <linux/export.h>

#include <target/target_core_base.h>

#include <target/target_core_transport.h>

#include <target/target_core_fabric_ops.h>

#include <target/target_core_fabric.h>

#include <target/target_core_fabric_configfs.h>

#include <target/target_core_fabric_lib.h>

#include <target/target_core_device.h>

#include <target/target_core_tpg.h>

#include <target/target_core_configfs.h>

#include <target/configfs_macros.h>
@@ -56,8 +52,7 @@ struct iscsi_portal_group *lio_get_tpg_from_tpg_item( 
{

	struct se_portal_group *se_tpg = container_of(to_config_group(item),

					struct se_portal_group, tpg_group);

	struct iscsi_portal_group *tpg =

			(struct iscsi_portal_group *)se_tpg->se_tpg_fabric_ptr;

	struct iscsi_portal_group *tpg = se_tpg->se_tpg_fabric_ptr;

	int ret;



	if (!tpg) {
@@ -1225,7 +1220,7 @@ struct se_portal_group *lio_target_tiqn_addtpg( 


	ret = core_tpg_register(

			&lio_target_fabric_configfs->tf_ops,

			wwn, &tpg->tpg_se_tpg, (void *)tpg,

			wwn, &tpg->tpg_se_tpg, tpg,

			TRANSPORT_TPG_TYPE_NORMAL);

	if (ret < 0)

		return NULL;

drivers/target/iscsi/iscsi_target_device.c

+1 −2
Original line number Diff line number Diff line
@@ -21,8 +21,7 @@ 


#include <scsi/scsi_device.h>

#include <target/target_core_base.h>

#include <target/target_core_device.h>

#include <target/target_core_transport.h>

#include <target/target_core_fabric.h>



#include "iscsi_target_core.h"

#include "iscsi_target_device.h"