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

Commit b0e3636f 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 

Pull SCSI target updates from Nicholas Bellinger:
 "Things have been quiet this round with mostly bugfixes, percpu
  conversions, and other minor iscsi-target conformance testing changes.

  The highlights include:

   - Add demo_mode_discovery attribute for iscsi-target (Thomas)
   - Convert tcm_fc(FCoE) to use percpu-ida pre-allocation
   - Add send completion interrupt coalescing for ib_isert
   - Convert target-core to use percpu-refcounting for se_lun
   - Fix mutex_trylock usage bug in iscsit_increment_maxcmdsn
   - tcm_loop updates (Hannes)
   - target-core ALUA cleanups + prep for v3.14 SCSI Referrals support (Hannes)

  v3.14 is currently shaping to be a busy development cycle in target
  land, with initial support for T10 Referrals and T10 DIF currently on
  the roadmap"

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: (40 commits)
  iscsi-target: chap auth shouldn't match username with trailing garbage
  iscsi-target: fix extract_param to handle buffer length corner case
  iscsi-target: Expose default_erl as TPG attribute
  target_core_configfs: split up ALUA supported states
  target_core_alua: Make supported states configurable
  target_core_alua: Store supported ALUA states
  target_core_alua: Rename ALUA_ACCESS_STATE_OPTIMIZED
  target_core_alua: spellcheck
  target core: rename (ex,im)plict -> (ex,im)plicit
  percpu-refcount: Add percpu-refcount.o to obj-y
  iscsi-target: Do not reject non-immediate CmdSNs exceeding MaxCmdSN
  iscsi-target: Convert iscsi_session statistics to atomic_long_t
  target: Convert se_device statistics to atomic_long_t
  target: Fix delayed Task Aborted Status (TAS) handling bug
  iscsi-target: Reject unsupported multi PDU text command sequence
  ib_isert: Avoid duplicate iscsit_increment_maxcmdsn call
  iscsi-target: Fix mutex_trylock usage in iscsit_increment_maxcmdsn
  target: Core does not need blkdev.h
  target: Pass through I/O topology for block backstores
  iser-target: Avoid using FRMR for single dma entry requests
  ...
parents 0032cdef 86784c6b

Documentation/target/tcm_mod_builder.py

+9 −9
Original line number Diff line number Diff line
@@ -440,15 +440,15 @@ def tcm_mod_build_configfs(proto_ident, fabric_mod_dir_var, fabric_mod_name): 
	buf += "	/*\n"

	buf += "	 * Setup default attribute lists for various fabric->tf_cit_tmpl\n"

	buf += "	 */\n"

	buf += "	TF_CIT_TMPL(fabric)->tfc_wwn_cit.ct_attrs = " + fabric_mod_name + "_wwn_attrs;\n"

	buf += "	TF_CIT_TMPL(fabric)->tfc_tpg_base_cit.ct_attrs = NULL;\n"

	buf += "	TF_CIT_TMPL(fabric)->tfc_tpg_attrib_cit.ct_attrs = NULL;\n"

	buf += "	TF_CIT_TMPL(fabric)->tfc_tpg_param_cit.ct_attrs = NULL;\n"

	buf += "	TF_CIT_TMPL(fabric)->tfc_tpg_np_base_cit.ct_attrs = NULL;\n"

	buf += "	TF_CIT_TMPL(fabric)->tfc_tpg_nacl_base_cit.ct_attrs = NULL;\n"

	buf += "	TF_CIT_TMPL(fabric)->tfc_tpg_nacl_attrib_cit.ct_attrs = NULL;\n"

	buf += "	TF_CIT_TMPL(fabric)->tfc_tpg_nacl_auth_cit.ct_attrs = NULL;\n"

	buf += "	TF_CIT_TMPL(fabric)->tfc_tpg_nacl_param_cit.ct_attrs = NULL;\n"

	buf += "	fabric->tf_cit_tmpl.tfc_wwn_cit.ct_attrs = " + fabric_mod_name + "_wwn_attrs;\n"

	buf += "	fabric->tf_cit_tmpl.tfc_tpg_base_cit.ct_attrs = NULL;\n"

	buf += "	fabric->tf_cit_tmpl.tfc_tpg_attrib_cit.ct_attrs = NULL;\n"

	buf += "	fabric->tf_cit_tmpl.tfc_tpg_param_cit.ct_attrs = NULL;\n"

	buf += "	fabric->tf_cit_tmpl.tfc_tpg_np_base_cit.ct_attrs = NULL;\n"

	buf += "	fabric->tf_cit_tmpl.tfc_tpg_nacl_base_cit.ct_attrs = NULL;\n"

	buf += "	fabric->tf_cit_tmpl.tfc_tpg_nacl_attrib_cit.ct_attrs = NULL;\n"

	buf += "	fabric->tf_cit_tmpl.tfc_tpg_nacl_auth_cit.ct_attrs = NULL;\n"

	buf += "	fabric->tf_cit_tmpl.tfc_tpg_nacl_param_cit.ct_attrs = NULL;\n"

	buf += "	/*\n"

	buf += "	 * Register the fabric for use within TCM\n"

	buf += "	 */\n"

drivers/infiniband/ulp/isert/ib_isert.c

+71 −28
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <linux/socket.h>

#include <linux/in.h>

#include <linux/in6.h>

#include <linux/llist.h>

#include <rdma/ib_verbs.h>

#include <rdma/rdma_cm.h>

#include <target/target_core_base.h>
@@ -489,6 +490,7 @@ isert_connect_request(struct rdma_cm_id *cma_id, struct rdma_cm_event *event) 
	kref_init(&isert_conn->conn_kref);

	kref_get(&isert_conn->conn_kref);

	mutex_init(&isert_conn->conn_mutex);

	mutex_init(&isert_conn->conn_comp_mutex);

	spin_lock_init(&isert_conn->conn_lock);



	cma_id->context = isert_conn;
@@ -843,14 +845,32 @@ isert_init_tx_hdrs(struct isert_conn *isert_conn, 
}



static void

isert_init_send_wr(struct isert_cmd *isert_cmd, struct ib_send_wr *send_wr)

isert_init_send_wr(struct isert_conn *isert_conn, struct isert_cmd *isert_cmd,

		   struct ib_send_wr *send_wr, bool coalesce)

{

	struct iser_tx_desc *tx_desc = &isert_cmd->tx_desc;



	isert_cmd->rdma_wr.iser_ib_op = ISER_IB_SEND;

	send_wr->wr_id = (unsigned long)&isert_cmd->tx_desc;

	send_wr->opcode = IB_WR_SEND;

	send_wr->send_flags = IB_SEND_SIGNALED;

	send_wr->sg_list = &isert_cmd->tx_desc.tx_sg[0];

	send_wr->sg_list = &tx_desc->tx_sg[0];

	send_wr->num_sge = isert_cmd->tx_desc.num_sge;

	/*

	 * Coalesce send completion interrupts by only setting IB_SEND_SIGNALED

	 * bit for every ISERT_COMP_BATCH_COUNT number of ib_post_send() calls.

	 */

	mutex_lock(&isert_conn->conn_comp_mutex);

	if (coalesce &&

	    ++isert_conn->conn_comp_batch < ISERT_COMP_BATCH_COUNT) {

		llist_add(&tx_desc->comp_llnode, &isert_conn->conn_comp_llist);

		mutex_unlock(&isert_conn->conn_comp_mutex);

		return;

	}

	isert_conn->conn_comp_batch = 0;

	tx_desc->comp_llnode_batch = llist_del_all(&isert_conn->conn_comp_llist);

	mutex_unlock(&isert_conn->conn_comp_mutex);



	send_wr->send_flags = IB_SEND_SIGNALED;

}



static int
@@ -1582,7 +1602,7 @@ isert_response_completion(struct iser_tx_desc *tx_desc, 
}



static void

isert_send_completion(struct iser_tx_desc *tx_desc,

__isert_send_completion(struct iser_tx_desc *tx_desc,

		        struct isert_conn *isert_conn)

{

	struct ib_device *ib_dev = isert_conn->conn_cm_id->device;
@@ -1623,6 +1643,24 @@ isert_send_completion(struct iser_tx_desc *tx_desc, 
	}

}



static void

isert_send_completion(struct iser_tx_desc *tx_desc,

		      struct isert_conn *isert_conn)

{

	struct llist_node *llnode = tx_desc->comp_llnode_batch;

	struct iser_tx_desc *t;

	/*

	 * Drain coalesced completion llist starting from comp_llnode_batch

	 * setup in isert_init_send_wr(), and then complete trailing tx_desc.

	 */

	while (llnode) {

		t = llist_entry(llnode, struct iser_tx_desc, comp_llnode);

		llnode = llist_next(llnode);

		__isert_send_completion(t, isert_conn);

	}

	__isert_send_completion(tx_desc, isert_conn);

}



static void

isert_cq_comp_err(struct iser_tx_desc *tx_desc, struct isert_conn *isert_conn)

{
@@ -1793,7 +1831,7 @@ isert_put_response(struct iscsi_conn *conn, struct iscsi_cmd *cmd) 
		isert_cmd->tx_desc.num_sge = 2;

	}



	isert_init_send_wr(isert_cmd, send_wr);

	isert_init_send_wr(isert_conn, isert_cmd, send_wr, true);



	pr_debug("Posting SCSI Response IB_WR_SEND >>>>>>>>>>>>>>>>>>>>>>\n");
@@ -1813,7 +1851,7 @@ isert_put_nopin(struct iscsi_cmd *cmd, struct iscsi_conn *conn, 
			       &isert_cmd->tx_desc.iscsi_header,

			       nopout_response);

	isert_init_tx_hdrs(isert_conn, &isert_cmd->tx_desc);

	isert_init_send_wr(isert_cmd, send_wr);

	isert_init_send_wr(isert_conn, isert_cmd, send_wr, false);



	pr_debug("Posting NOPIN Response IB_WR_SEND >>>>>>>>>>>>>>>>>>>>>>\n");
@@ -1831,7 +1869,7 @@ isert_put_logout_rsp(struct iscsi_cmd *cmd, struct iscsi_conn *conn) 
	iscsit_build_logout_rsp(cmd, conn, (struct iscsi_logout_rsp *)

				&isert_cmd->tx_desc.iscsi_header);

	isert_init_tx_hdrs(isert_conn, &isert_cmd->tx_desc);

	isert_init_send_wr(isert_cmd, send_wr);

	isert_init_send_wr(isert_conn, isert_cmd, send_wr, false);



	pr_debug("Posting Logout Response IB_WR_SEND >>>>>>>>>>>>>>>>>>>>>>\n");
@@ -1849,7 +1887,7 @@ isert_put_tm_rsp(struct iscsi_cmd *cmd, struct iscsi_conn *conn) 
	iscsit_build_task_mgt_rsp(cmd, conn, (struct iscsi_tm_rsp *)

				  &isert_cmd->tx_desc.iscsi_header);

	isert_init_tx_hdrs(isert_conn, &isert_cmd->tx_desc);

	isert_init_send_wr(isert_cmd, send_wr);

	isert_init_send_wr(isert_conn, isert_cmd, send_wr, false);



	pr_debug("Posting Task Management Response IB_WR_SEND >>>>>>>>>>>>>>>>>>>>>>\n");
@@ -1881,7 +1919,7 @@ isert_put_reject(struct iscsi_cmd *cmd, struct iscsi_conn *conn) 
	tx_dsg->lkey	= isert_conn->conn_mr->lkey;

	isert_cmd->tx_desc.num_sge = 2;



	isert_init_send_wr(isert_cmd, send_wr);

	isert_init_send_wr(isert_conn, isert_cmd, send_wr, false);



	pr_debug("Posting Reject IB_WR_SEND >>>>>>>>>>>>>>>>>>>>>>\n");
@@ -1921,7 +1959,7 @@ isert_put_text_rsp(struct iscsi_cmd *cmd, struct iscsi_conn *conn) 
		tx_dsg->lkey	= isert_conn->conn_mr->lkey;

		isert_cmd->tx_desc.num_sge = 2;

	}

	isert_init_send_wr(isert_cmd, send_wr);

	isert_init_send_wr(isert_conn, isert_cmd, send_wr, false);



	pr_debug("Posting Text Response IB_WR_SEND >>>>>>>>>>>>>>>>>>>>>>\n");
@@ -1991,8 +2029,6 @@ isert_map_rdma(struct iscsi_conn *conn, struct iscsi_cmd *cmd, 


	if (wr->iser_ib_op == ISER_IB_RDMA_WRITE) {

		data_left = se_cmd->data_length;

		iscsit_increment_maxcmdsn(cmd, conn->sess);

		cmd->stat_sn = conn->stat_sn++;

	} else {

		sg_off = cmd->write_data_done / PAGE_SIZE;

		data_left = se_cmd->data_length - cmd->write_data_done;
@@ -2204,8 +2240,6 @@ isert_reg_rdma_frwr(struct iscsi_conn *conn, struct iscsi_cmd *cmd, 


	if (wr->iser_ib_op == ISER_IB_RDMA_WRITE) {

		data_left = se_cmd->data_length;

		iscsit_increment_maxcmdsn(cmd, conn->sess);

		cmd->stat_sn = conn->stat_sn++;

	} else {

		sg_off = cmd->write_data_done / PAGE_SIZE;

		data_left = se_cmd->data_length - cmd->write_data_done;
@@ -2259,6 +2293,13 @@ isert_reg_rdma_frwr(struct iscsi_conn *conn, struct iscsi_cmd *cmd, 
	data_len = min(data_left, rdma_write_max);

	wr->cur_rdma_length = data_len;



	/* if there is a single dma entry, dma mr is sufficient */

	if (count == 1) {

		ib_sge->addr = ib_sg_dma_address(ib_dev, &sg_start[0]);

		ib_sge->length = ib_sg_dma_len(ib_dev, &sg_start[0]);

		ib_sge->lkey = isert_conn->conn_mr->lkey;

		wr->fr_desc = NULL;

	} else {

		spin_lock_irqsave(&isert_conn->conn_lock, flags);

		fr_desc = list_first_entry(&isert_conn->conn_frwr_pool,

					   struct fast_reg_descriptor, list);
@@ -2272,6 +2313,7 @@ isert_reg_rdma_frwr(struct iscsi_conn *conn, struct iscsi_cmd *cmd, 
			list_add_tail(&fr_desc->list, &isert_conn->conn_frwr_pool);

			goto unmap_sg;

		}

	}



	return 0;
@@ -2306,10 +2348,11 @@ isert_put_datain(struct iscsi_conn *conn, struct iscsi_cmd *cmd) 
	 * Build isert_conn->tx_desc for iSCSI response PDU and attach

	 */

	isert_create_send_desc(isert_conn, isert_cmd, &isert_cmd->tx_desc);

	iscsit_build_rsp_pdu(cmd, conn, false, (struct iscsi_scsi_rsp *)

	iscsit_build_rsp_pdu(cmd, conn, true, (struct iscsi_scsi_rsp *)

			     &isert_cmd->tx_desc.iscsi_header);

	isert_init_tx_hdrs(isert_conn, &isert_cmd->tx_desc);

	isert_init_send_wr(isert_cmd, &isert_cmd->tx_desc.send_wr);

	isert_init_send_wr(isert_conn, isert_cmd,

			   &isert_cmd->tx_desc.send_wr, true);



	atomic_inc(&isert_conn->post_send_buf_count);

drivers/infiniband/ulp/isert/ib_isert.h

+6 −0
Original line number Diff line number Diff line
@@ -43,6 +43,8 @@ struct iser_tx_desc { 
	struct ib_sge	tx_sg[2];

	int		num_sge;

	struct isert_cmd *isert_cmd;

	struct llist_node *comp_llnode_batch;

	struct llist_node comp_llnode;

	struct ib_send_wr send_wr;

} __packed;
@@ -121,6 +123,10 @@ struct isert_conn { 
	int			conn_frwr_pool_size;

	/* lock to protect frwr_pool */

	spinlock_t		conn_lock;

#define ISERT_COMP_BATCH_COUNT	8

	int			conn_comp_batch;

	struct llist_head	conn_comp_llist;

	struct mutex		conn_comp_mutex;

};



#define ISERT_MAX_CQ 64

drivers/infiniband/ulp/srpt/ib_srpt.c

+0 −10
Original line number Diff line number Diff line
@@ -1352,11 +1352,8 @@ static int srpt_abort_cmd(struct srpt_send_ioctx *ioctx) 


		/* XXX(hch): this is a horrible layering violation.. */

		spin_lock_irqsave(&ioctx->cmd.t_state_lock, flags);

		ioctx->cmd.transport_state |= CMD_T_LUN_STOP;

		ioctx->cmd.transport_state &= ~CMD_T_ACTIVE;

		spin_unlock_irqrestore(&ioctx->cmd.t_state_lock, flags);



		complete(&ioctx->cmd.transport_lun_stop_comp);

		break;

	case SRPT_STATE_CMD_RSP_SENT:

		/*
@@ -1364,9 +1361,6 @@ static int srpt_abort_cmd(struct srpt_send_ioctx *ioctx) 
		 * not been received in time.

		 */

		srpt_unmap_sg_to_ib_sge(ioctx->ch, ioctx);

		spin_lock_irqsave(&ioctx->cmd.t_state_lock, flags);

		ioctx->cmd.transport_state |= CMD_T_LUN_STOP;

		spin_unlock_irqrestore(&ioctx->cmd.t_state_lock, flags);

		target_put_sess_cmd(ioctx->ch->sess, &ioctx->cmd);

		break;

	case SRPT_STATE_MGMT_RSP_SENT:
@@ -1476,7 +1470,6 @@ static void srpt_handle_rdma_err_comp(struct srpt_rdma_ch *ch, 
{

	struct se_cmd *cmd;

	enum srpt_command_state state;

	unsigned long flags;



	cmd = &ioctx->cmd;

	state = srpt_get_cmd_state(ioctx);
@@ -1496,9 +1489,6 @@ static void srpt_handle_rdma_err_comp(struct srpt_rdma_ch *ch, 
			       __func__, __LINE__, state);

		break;

	case SRPT_RDMA_WRITE_LAST:

		spin_lock_irqsave(&ioctx->cmd.t_state_lock, flags);

		ioctx->cmd.transport_state |= CMD_T_LUN_STOP;

		spin_unlock_irqrestore(&ioctx->cmd.t_state_lock, flags);

		break;

	default:

		printk(KERN_ERR "%s[%d]: opcode = %u\n", __func__,

drivers/scsi/qla2xxx/tcm_qla2xxx.c

+28 −28
Original line number Diff line number Diff line
@@ -330,7 +330,7 @@ static int tcm_qla2xxx_check_demo_mode(struct se_portal_group *se_tpg) 
	struct tcm_qla2xxx_tpg *tpg = container_of(se_tpg,

				struct tcm_qla2xxx_tpg, se_tpg);



	return QLA_TPG_ATTRIB(tpg)->generate_node_acls;

	return tpg->tpg_attrib.generate_node_acls;

}



static int tcm_qla2xxx_check_demo_mode_cache(struct se_portal_group *se_tpg)
@@ -338,7 +338,7 @@ static int tcm_qla2xxx_check_demo_mode_cache(struct se_portal_group *se_tpg) 
	struct tcm_qla2xxx_tpg *tpg = container_of(se_tpg,

				struct tcm_qla2xxx_tpg, se_tpg);



	return QLA_TPG_ATTRIB(tpg)->cache_dynamic_acls;

	return tpg->tpg_attrib.cache_dynamic_acls;

}



static int tcm_qla2xxx_check_demo_write_protect(struct se_portal_group *se_tpg)
@@ -346,7 +346,7 @@ static int tcm_qla2xxx_check_demo_write_protect(struct se_portal_group *se_tpg) 
	struct tcm_qla2xxx_tpg *tpg = container_of(se_tpg,

				struct tcm_qla2xxx_tpg, se_tpg);



	return QLA_TPG_ATTRIB(tpg)->demo_mode_write_protect;

	return tpg->tpg_attrib.demo_mode_write_protect;

}



static int tcm_qla2xxx_check_prod_write_protect(struct se_portal_group *se_tpg)
@@ -354,7 +354,7 @@ static int tcm_qla2xxx_check_prod_write_protect(struct se_portal_group *se_tpg) 
	struct tcm_qla2xxx_tpg *tpg = container_of(se_tpg,

				struct tcm_qla2xxx_tpg, se_tpg);



	return QLA_TPG_ATTRIB(tpg)->prod_mode_write_protect;

	return tpg->tpg_attrib.prod_mode_write_protect;

}



static int tcm_qla2xxx_check_demo_mode_login_only(struct se_portal_group *se_tpg)
@@ -362,7 +362,7 @@ static int tcm_qla2xxx_check_demo_mode_login_only(struct se_portal_group *se_tpg 
	struct tcm_qla2xxx_tpg *tpg = container_of(se_tpg,

				struct tcm_qla2xxx_tpg, se_tpg);



	return QLA_TPG_ATTRIB(tpg)->demo_mode_login_only;

	return tpg->tpg_attrib.demo_mode_login_only;

}



static struct se_node_acl *tcm_qla2xxx_alloc_fabric_acl(
@@ -847,7 +847,7 @@ static ssize_t tcm_qla2xxx_tpg_attrib_show_##name( \ 
	struct tcm_qla2xxx_tpg *tpg = container_of(se_tpg,		\

			struct tcm_qla2xxx_tpg, se_tpg);		\

									\

	return sprintf(page, "%u\n", QLA_TPG_ATTRIB(tpg)->name);	\

	return sprintf(page, "%u\n", tpg->tpg_attrib.name);	\

}									\

									\

static ssize_t tcm_qla2xxx_tpg_attrib_store_##name(			\
@@ -1027,10 +1027,10 @@ static struct se_portal_group *tcm_qla2xxx_make_tpg( 
	 * By default allow READ-ONLY TPG demo-mode access w/ cached dynamic

	 * NodeACLs

	 */

	QLA_TPG_ATTRIB(tpg)->generate_node_acls = 1;

	QLA_TPG_ATTRIB(tpg)->demo_mode_write_protect = 1;

	QLA_TPG_ATTRIB(tpg)->cache_dynamic_acls = 1;

	QLA_TPG_ATTRIB(tpg)->demo_mode_login_only = 1;

	tpg->tpg_attrib.generate_node_acls = 1;

	tpg->tpg_attrib.demo_mode_write_protect = 1;

	tpg->tpg_attrib.cache_dynamic_acls = 1;

	tpg->tpg_attrib.demo_mode_login_only = 1;



	ret = core_tpg_register(&tcm_qla2xxx_fabric_configfs->tf_ops, wwn,

				&tpg->se_tpg, tpg, TRANSPORT_TPG_TYPE_NORMAL);
@@ -1830,16 +1830,16 @@ static int tcm_qla2xxx_register_configfs(void) 
	/*

	 * Setup default attribute lists for various fabric->tf_cit_tmpl

	 */

	TF_CIT_TMPL(fabric)->tfc_wwn_cit.ct_attrs = tcm_qla2xxx_wwn_attrs;

	TF_CIT_TMPL(fabric)->tfc_tpg_base_cit.ct_attrs = tcm_qla2xxx_tpg_attrs;

	TF_CIT_TMPL(fabric)->tfc_tpg_attrib_cit.ct_attrs =

	fabric->tf_cit_tmpl.tfc_wwn_cit.ct_attrs = tcm_qla2xxx_wwn_attrs;

	fabric->tf_cit_tmpl.tfc_tpg_base_cit.ct_attrs = tcm_qla2xxx_tpg_attrs;

	fabric->tf_cit_tmpl.tfc_tpg_attrib_cit.ct_attrs =

						tcm_qla2xxx_tpg_attrib_attrs;

	TF_CIT_TMPL(fabric)->tfc_tpg_param_cit.ct_attrs = NULL;

	TF_CIT_TMPL(fabric)->tfc_tpg_np_base_cit.ct_attrs = NULL;

	TF_CIT_TMPL(fabric)->tfc_tpg_nacl_base_cit.ct_attrs = NULL;

	TF_CIT_TMPL(fabric)->tfc_tpg_nacl_attrib_cit.ct_attrs = NULL;

	TF_CIT_TMPL(fabric)->tfc_tpg_nacl_auth_cit.ct_attrs = NULL;

	TF_CIT_TMPL(fabric)->tfc_tpg_nacl_param_cit.ct_attrs = NULL;

	fabric->tf_cit_tmpl.tfc_tpg_param_cit.ct_attrs = NULL;

	fabric->tf_cit_tmpl.tfc_tpg_np_base_cit.ct_attrs = NULL;

	fabric->tf_cit_tmpl.tfc_tpg_nacl_base_cit.ct_attrs = NULL;

	fabric->tf_cit_tmpl.tfc_tpg_nacl_attrib_cit.ct_attrs = NULL;

	fabric->tf_cit_tmpl.tfc_tpg_nacl_auth_cit.ct_attrs = NULL;

	fabric->tf_cit_tmpl.tfc_tpg_nacl_param_cit.ct_attrs = NULL;

	/*

	 * Register the fabric for use within TCM

	 */
@@ -1870,15 +1870,15 @@ static int tcm_qla2xxx_register_configfs(void) 
	/*

	 * Setup default attribute lists for various npiv_fabric->tf_cit_tmpl

	 */

	TF_CIT_TMPL(npiv_fabric)->tfc_wwn_cit.ct_attrs = tcm_qla2xxx_wwn_attrs;

	TF_CIT_TMPL(npiv_fabric)->tfc_tpg_base_cit.ct_attrs = NULL;

	TF_CIT_TMPL(npiv_fabric)->tfc_tpg_attrib_cit.ct_attrs = NULL;

	TF_CIT_TMPL(npiv_fabric)->tfc_tpg_param_cit.ct_attrs = NULL;

	TF_CIT_TMPL(npiv_fabric)->tfc_tpg_np_base_cit.ct_attrs = NULL;

	TF_CIT_TMPL(npiv_fabric)->tfc_tpg_nacl_base_cit.ct_attrs = NULL;

	TF_CIT_TMPL(npiv_fabric)->tfc_tpg_nacl_attrib_cit.ct_attrs = NULL;

	TF_CIT_TMPL(npiv_fabric)->tfc_tpg_nacl_auth_cit.ct_attrs = NULL;

	TF_CIT_TMPL(npiv_fabric)->tfc_tpg_nacl_param_cit.ct_attrs = NULL;

	npiv_fabric->tf_cit_tmpl.tfc_wwn_cit.ct_attrs = tcm_qla2xxx_wwn_attrs;

	npiv_fabric->tf_cit_tmpl.tfc_tpg_base_cit.ct_attrs = NULL;

	npiv_fabric->tf_cit_tmpl.tfc_tpg_attrib_cit.ct_attrs = NULL;

	npiv_fabric->tf_cit_tmpl.tfc_tpg_param_cit.ct_attrs = NULL;

	npiv_fabric->tf_cit_tmpl.tfc_tpg_np_base_cit.ct_attrs = NULL;

	npiv_fabric->tf_cit_tmpl.tfc_tpg_nacl_base_cit.ct_attrs = NULL;

	npiv_fabric->tf_cit_tmpl.tfc_tpg_nacl_attrib_cit.ct_attrs = NULL;

	npiv_fabric->tf_cit_tmpl.tfc_tpg_nacl_auth_cit.ct_attrs = NULL;

	npiv_fabric->tf_cit_tmpl.tfc_tpg_nacl_param_cit.ct_attrs = NULL;

	/*

	 * Register the npiv_fabric for use within TCM

	 */