From 8024fd5142c7bf64e2092060d4046f5fd4f6b082 Mon Sep 17 00:00:00 2001 From: Andy Grover Date: Thu, 12 Jul 2012 17:34:57 -0700 Subject: [PATCH] --- yaml --- r: 312684 b: refs/heads/master c: cdf88a2fe3825458c584cd751aa843ab3af6a42c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/target/target_core_tpg.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 223d3e8e4610..ce153f73a1d9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 617a0c2eb316c4d3c8a67255f85c7cf676ab59a9 +refs/heads/master: cdf88a2fe3825458c584cd751aa843ab3af6a42c diff --git a/trunk/drivers/target/target_core_tpg.c b/trunk/drivers/target/target_core_tpg.c index 8bd58e284185..5ca340cff111 100644 --- a/trunk/drivers/target/target_core_tpg.c +++ b/trunk/drivers/target/target_core_tpg.c @@ -306,10 +306,8 @@ struct se_node_acl *core_tpg_check_initiator_node_acl( * TPG LUNs if the fabric is not explictly asking for * tpg_check_demo_mode_login_only() == 1. */ - if ((tpg->se_tpg_tfo->tpg_check_demo_mode_login_only != NULL) && - (tpg->se_tpg_tfo->tpg_check_demo_mode_login_only(tpg) == 1)) - do { ; } while (0); - else + if ((tpg->se_tpg_tfo->tpg_check_demo_mode_login_only == NULL) || + (tpg->se_tpg_tfo->tpg_check_demo_mode_login_only(tpg) != 1)) core_tpg_add_node_to_devs(acl, tpg); spin_lock_irq(&tpg->acl_node_lock);