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

Commit 22d11759 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Nicholas Bellinger
Browse files

target: make ->shutdown_session optional 



Turns out the template and thus many drivers got the return value wrong:
0 means the fabrics driver needs to put a session reference, which no
driver except for the iSCSI target drivers did.  Fortunately none of these
drivers supports explicit Node ACLs, so the bug was harmless.

Even without that only qla2xxx and iscsi every did real work in
shutdown_session, so get rid of the boilerplate code in all other
drivers.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
parent fba81f88

Documentation/target/tcm_mod_builder.py

+0 −8
Original line number Diff line number Diff line
@@ -294,7 +294,6 @@ def tcm_mod_build_configfs(proto_ident, fabric_mod_dir_var, fabric_mod_name): 
	buf += "	.tpg_check_prod_mode_write_protect = " + fabric_mod_name + "_check_false,\n"

	buf += "	.tpg_get_inst_index		= " + fabric_mod_name + "_tpg_get_inst_index,\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 += "	.sess_get_index			= " + fabric_mod_name + "_sess_get_index,\n"

	buf += "	.sess_get_initiator_sid		= NULL,\n"
@@ -467,13 +466,6 @@ def tcm_mod_dump_fabric_ops(proto_ident, fabric_mod_dir_var, fabric_mod_name): 
			buf += "}\n\n"

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



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

			buf += "int " + fabric_mod_name + "_shutdown_session(struct se_session *se_sess)\n"

			buf += "{\n"

			buf += "	return 0;\n"

			buf += "}\n\n"

			bufi += "int " + fabric_mod_name + "_shutdown_session(struct se_session *);\n"



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

			buf += "void " + fabric_mod_name + "_close_session(struct se_session *se_sess)\n"

			buf += "{\n"

drivers/infiniband/ulp/srpt/ib_srpt.c

+0 −9
Original line number Diff line number Diff line
@@ -1960,14 +1960,6 @@ static void __srpt_close_all_ch(struct srpt_device *sdev) 
	}

}



/**

 * srpt_shutdown_session() - Whether or not a session may be shut down.

 */

static int srpt_shutdown_session(struct se_session *se_sess)

{

	return 1;

}



static void srpt_free_ch(struct kref *kref)

{

	struct srpt_rdma_ch *ch = container_of(kref, struct srpt_rdma_ch, kref);
@@ -3287,7 +3279,6 @@ static const struct target_core_fabric_ops srpt_template = { 
	.tpg_get_inst_index		= srpt_tpg_get_inst_index,

	.release_cmd			= srpt_release_cmd,

	.check_stop_free		= srpt_check_stop_free,

	.shutdown_session		= srpt_shutdown_session,

	.close_session			= srpt_close_session,

	.sess_get_index			= srpt_sess_get_index,

	.sess_get_initiator_sid		= NULL,

drivers/target/loopback/tcm_loop.c

+0 −6
Original line number Diff line number Diff line
@@ -601,11 +601,6 @@ static int tcm_loop_get_cmd_state(struct se_cmd *se_cmd) 
	return tl_cmd->sc_cmd_state;

}



static int tcm_loop_shutdown_session(struct se_session *se_sess)

{

	return 0;

}



static void tcm_loop_close_session(struct se_session *se_sess)

{

	return;
@@ -1243,7 +1238,6 @@ static const struct target_core_fabric_ops loop_ops = { 
	.tpg_get_inst_index		= tcm_loop_get_inst_index,

	.check_stop_free		= tcm_loop_check_stop_free,

	.release_cmd			= tcm_loop_release_cmd,

	.shutdown_session		= tcm_loop_shutdown_session,

	.close_session			= tcm_loop_close_session,

	.sess_get_index			= tcm_loop_sess_get_index,

	.write_pending			= tcm_loop_write_pending,

drivers/target/sbp/sbp_target.c

+0 −6
Original line number Diff line number Diff line
@@ -1726,11 +1726,6 @@ static void sbp_release_cmd(struct se_cmd *se_cmd) 
	sbp_free_request(req);

}



static int sbp_shutdown_session(struct se_session *se_sess)

{

	return 0;

}



static void sbp_close_session(struct se_session *se_sess)

{

	return;
@@ -2349,7 +2344,6 @@ static const struct target_core_fabric_ops sbp_ops = { 
	.tpg_check_prod_mode_write_protect = sbp_check_false,

	.tpg_get_inst_index		= sbp_tpg_get_inst_index,

	.release_cmd			= sbp_release_cmd,

	.shutdown_session		= sbp_shutdown_session,

	.close_session			= sbp_close_session,

	.sess_get_index			= sbp_sess_get_index,

	.write_pending			= sbp_write_pending,

drivers/target/target_core_configfs.c

+0 −4
Original line number Diff line number Diff line
@@ -385,10 +385,6 @@ static int target_fabric_tf_ops_check(const struct target_core_fabric_ops *tfo) 
		pr_err("Missing tfo->release_cmd()\n");

		return -EINVAL;

	}

	if (!tfo->shutdown_session) {

		pr_err("Missing tfo->shutdown_session()\n");

		return -EINVAL;

	}

	if (!tfo->close_session) {

		pr_err("Missing tfo->close_session()\n");

		return -EINVAL;