Merge branch 'svn-trunk'

Conflicts:
	www/handler_fileio_tgt.html
	www/scst_admin.html
	www/target_emulex.html
	www/target_fcoe.html
	www/target_ibmvscsi.html
	www/target_iscsi.html
	www/target_local.html
	www/target_lsi.html
	www/target_mvsas.html
	www/target_old.html
	www/target_qla2x00t.html
	www/target_srp.html
	www/targets.html

iscsi-scst/Makefile

@@ -101,12 +101,12 @@ else
 endif
 
 mods: Modules.symvers Module.symvers
-	echo "  Building against $(OFED_FLAVOR) InfiniBand kernel headers."
 	$(MAKE) -C $(KDIR) SCST_INC_DIR=$(SCST_INC_DIR) SUBDIRS=$(KMOD) modules
-	if $(INFINIBAND_ENABLED); then					\
-	  $(MAKE) -C $(KDIR) SCST_INC_DIR=$(SCST_INC_DIR) SUBDIRS=$(ISERTMOD) \
-	  PRE_CFLAGS="$(OFED_CFLAGS) -DOFED_FLAVOR=$(OFED_FLAVOR)" \
-	  KBUILD_EXTRA_SYMBOLS=$(ISER_SYMVERS) modules; \
+	if $(INFINIBAND_ENABLED); then					       \
+	  echo "  Building against $(OFED_FLAVOR) InfiniBand kernel headers."; \
+	  $(MAKE) -C $(KDIR) SCST_INC_DIR=$(SCST_INC_DIR) SUBDIRS=$(ISERTMOD)  \
+	  PRE_CFLAGS="$(OFED_CFLAGS) -DOFED_FLAVOR=$(OFED_FLAVOR)"	       \
+	  KBUILD_EXTRA_SYMBOLS=$(ISER_SYMVERS) modules;			       \
 	fi
 
 progs:
@@ -131,7 +131,7 @@ install: all
 	if $(INFINIBAND_ENABLED); then					      \
 	  $(MAKE) -C $(KDIR) SCST_INC_DIR=$(SCST_INC_DIR) SUBDIRS=$(ISERTMOD) \
 	    $$([ -n "$(DESTDIR)$(INSTALL_MOD_PATH)" ] && echo DEPMOD=true)    \
-	    modules_install
+	    modules_install;						      \
 	fi
 
 uninstall:

iscsi-scst/kernel/iscsi.c

@@ -2329,8 +2329,12 @@ static void __cmnd_abort(struct iscsi_cmnd *cmnd)
 		cmnd->r2t_len_to_send, cmnd_scsicode(cmnd),
 		cmnd_write_size(cmnd), cmnd->outstanding_r2t,
 		cmnd->conn->session->exp_cmd_sn, cmnd->conn,
-		cmnd->conn->rd_task, cmnd->conn->read_cmnd,
-		cmnd->conn->read_state);
+#ifdef CONFIG_SCST_EXTRACHECKS
+		cmnd->conn->rd_task,
+#else
+		NULL,
+#endif
+		cmnd->conn->read_cmnd, cmnd->conn->read_state);
 
 #if defined(CONFIG_TCP_ZERO_COPY_TRANSFER_COMPLETION_NOTIFICATION)
 	TRACE_MGMT_DBG("net_ref_cnt %d", atomic_read(&cmnd->net_ref_cnt));

iscsi-scst/kernel/iscsi.h

@@ -280,7 +280,9 @@ struct iscsi_conn {
 
 	struct list_head rd_list_entry;
 
+#ifdef CONFIG_SCST_EXTRACHECKS
 	struct task_struct *rd_task;
+#endif
 
 	unsigned long last_rcv_time;