Skip to content

Commit 5256ffd

Browse files
author
Nicholas Bellinger
committed
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: Nicholas Bellinger <[email protected]>
1 parent 3160723 commit 5256ffd

File tree

2 files changed

+1
-4
lines changed

2 files changed

+1
-4
lines changed

drivers/target/iscsi/iscsi_target_tpg.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ static void iscsit_clear_tpg_np_login_thread(
188188
iscsit_reset_np_thread(tpg_np->tpg_np, tpg_np, tpg, shutdown);
189189
}
190190

191-
void iscsit_clear_tpg_np_login_threads(
191+
static void iscsit_clear_tpg_np_login_threads(
192192
struct iscsi_portal_group *tpg,
193193
bool shutdown)
194194
{
@@ -275,8 +275,6 @@ int iscsit_tpg_del_portal_group(
275275
tpg->tpg_state = TPG_STATE_INACTIVE;
276276
spin_unlock(&tpg->tpg_state_lock);
277277

278-
iscsit_clear_tpg_np_login_threads(tpg, true);
279-
280278
if (iscsit_release_sessions_for_tpg(tpg, force) < 0) {
281279
pr_err("Unable to delete iSCSI Target Portal Group:"
282280
" %hu while active sessions exist, and force=0\n",

drivers/target/iscsi/iscsi_target_tpg.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ extern struct iscsi_portal_group *iscsit_get_tpg_from_np(struct iscsi_tiqn *,
88
struct iscsi_np *, struct iscsi_tpg_np **);
99
extern int iscsit_get_tpg(struct iscsi_portal_group *);
1010
extern void iscsit_put_tpg(struct iscsi_portal_group *);
11-
extern void iscsit_clear_tpg_np_login_threads(struct iscsi_portal_group *, bool);
1211
extern void iscsit_tpg_dump_params(struct iscsi_portal_group *);
1312
extern int iscsit_tpg_add_portal_group(struct iscsi_tiqn *, struct iscsi_portal_group *);
1413
extern int iscsit_tpg_del_portal_group(struct iscsi_tiqn *, struct iscsi_portal_group *,

0 commit comments

Comments
 (0)