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

Commit 5256ffdb authored by Nicholas Bellinger's avatar Nicholas Bellinger
Browse files

iscsi-target: Remove no-op from iscsit_tpg_del_portal_group 



This patch removes a no-op iscsit_clear_tpg_np_login_threads() call
in iscsit_tpg_del_portal_group(), which is unnecessary because
iscsit_tpg_del_portal_group() can only ever be removed from configfs
once all of the child network portals have been released.

Also, go ahed and make iscsit_clear_tpg_np_login_threads() declared
as static.

Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
parent 3160723c

drivers/target/iscsi/iscsi_target_tpg.c

+1 −3
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ static void iscsit_clear_tpg_np_login_thread( 
	iscsit_reset_np_thread(tpg_np->tpg_np, tpg_np, tpg, shutdown);

}



void iscsit_clear_tpg_np_login_threads(

static void iscsit_clear_tpg_np_login_threads(

	struct iscsi_portal_group *tpg,

	bool shutdown)

{
@@ -275,8 +275,6 @@ int iscsit_tpg_del_portal_group( 
	tpg->tpg_state = TPG_STATE_INACTIVE;

	spin_unlock(&tpg->tpg_state_lock);



	iscsit_clear_tpg_np_login_threads(tpg, true);



	if (iscsit_release_sessions_for_tpg(tpg, force) < 0) {

		pr_err("Unable to delete iSCSI Target Portal Group:"

			" %hu while active sessions exist, and force=0\n",

drivers/target/iscsi/iscsi_target_tpg.h

+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ extern struct iscsi_portal_group *iscsit_get_tpg_from_np(struct iscsi_tiqn *, 
			struct iscsi_np *, struct iscsi_tpg_np **);

extern int iscsit_get_tpg(struct iscsi_portal_group *);

extern void iscsit_put_tpg(struct iscsi_portal_group *);

extern void iscsit_clear_tpg_np_login_threads(struct iscsi_portal_group *, bool);

extern void iscsit_tpg_dump_params(struct iscsi_portal_group *);

extern int iscsit_tpg_add_portal_group(struct iscsi_tiqn *, struct iscsi_portal_group *);

extern int iscsit_tpg_del_portal_group(struct iscsi_tiqn *, struct iscsi_portal_group *,