mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-07-20 06:52:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 3909,3917,3923,3935 via svnmerge from

Browse Source 
https://vlnb@scst.svn.sourceforge.net/svnroot/scst/trunk

........
  r3909 | vlnb | 2011-11-04 17:34:10 -0400 (Fri, 04 Nov 2011) | 3 lines
  
  Fix build without CONFIG_SCSI_QLA2XXX_TARGET
........
  r3917 | vlnb | 2011-11-08 21:47:23 -0500 (Tue, 08 Nov 2011) | 4 lines
  
  task_mgmt_fn() callback now called under lock and IRQs disabled, so we
  need to reschedule to thread during commands unjamming
........
  r3923 | vlnb | 2011-11-15 20:53:27 -0500 (Tue, 15 Nov 2011) | 3 lines
  
  Fix incorrect attach_tgt() errors processing in the sysfs build reported by David Pineau <dav.pineau@gmail.com>
........
  r3935 | vlnb | 2011-11-22 21:14:38 -0500 (Tue, 22 Nov 2011) | 3 lines
  
  Report target name when session assigned to security group
........


git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/2.1.0.x@3971 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Vladislav Bolkhovitin
2011-12-10 04:22:53 +00:00
parent 7dab47749e
commit 4023e12c40
4 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qla2x00t/qla_mbx.c
+4
View File
@@ -1020,12 +1020,14 @@ qla2x00_init_firmware(scsi_qla_host_t *ha, uint16_t size)
DEBUG11(printk("qla2x00_init_firmware(%ld): entered.\n",
ha->host_no));
#ifdef CONFIG_SCSI_QLA2XXX_TARGET
if (!qla_tgt_mode_enabled(ha) && !qla_ini_mode_enabled(ha)) {
DEBUG11(printk("qla2x00_init_firmware(%ld): neither initiator, "
"nor target mode enabled, exiting\n", ha->host_no));
rval = QLA_SUCCESS;
goto out;
}
#endif
#ifdef QL_DEBUG_LEVEL_5
if (IS_FWI2_CAPABLE(ha)) {
@@ -2255,12 +2257,14 @@ qla24xx_get_isp_stats(scsi_qla_host_t *ha, struct link_statistics *stats,
mbx_cmd_t *mcp = &mc;
uint32_t *siter, *diter, dwords;
#ifdef CONFIG_SCSI_QLA2XXX_TARGET
if (!qla_tgt_mode_enabled(ha) && !qla_ini_mode_enabled(ha)) {
DEBUG2_3_11(printk("%s(%ld): neither initiator, nor target "
"mode enabled, no stats returned\n",
__func__, ha->host_no));
return QLA_FUNCTION_FAILED;
}
#endif
DEBUG11(printk("%s(%ld): entered.\n", __func__, ha->host_no));
scst/src/dev_handlers/scst_user.c
+1 -1
View File
@@ -2239,7 +2239,7 @@ static void dev_user_unjam_cmd(struct scst_user_cmd *ucmd, int busy,
}
ucmd->cmd->scst_cmd_done(ucmd->cmd, SCST_CMD_STATE_DEFAULT,
SCST_CONTEXT_DIRECT);
SCST_CONTEXT_THREAD);
/* !! At this point cmd and ucmd can be already freed !! */
if (flags != NULL)
scst/src/scst_lib.c
+2 -5
View File
@@ -2749,7 +2749,6 @@ int scst_acg_add_lun(struct scst_acg *acg, struct kobject *parent,
struct scst_tgt_dev *tgt_dev;
struct scst_session *sess;
LIST_HEAD(tmp_tgt_dev_list);
bool del_sysfs = true;
TRACE_ENTRY();
@@ -2779,10 +2778,8 @@ int scst_acg_add_lun(struct scst_acg *acg, struct kobject *parent,
}
res = scst_acg_dev_sysfs_create(acg_dev, parent);
if (res != 0) {
del_sysfs = false;
if (res != 0)
goto out_free;
}
if (gen_scst_report_luns_changed)
scst_report_luns_changed(acg);
@@ -2803,7 +2800,7 @@ out_free:
extra_tgt_dev_list_entry) {
scst_free_tgt_dev(tgt_dev);
}
scst_del_free_acg_dev(acg_dev, del_sysfs);
scst_del_free_acg_dev(acg_dev, false);
goto out;
}
scst/src/scst_targ.c
+3 -2
View File
@@ -6281,8 +6281,9 @@ static int scst_init_session(struct scst_session *sess)
sess->acg = scst_find_acg(sess);
PRINT_INFO("Using security group \"%s\" for initiator \"%s\"",
sess->acg->acg_name, sess->initiator_name);
PRINT_INFO("Using security group \"%s\" for initiator \"%s\" "
"(target %s)", sess->acg->acg_name, sess->initiator_name,
sess->tgt->tgt_name);
list_add_tail(&sess->acg_sess_list_entry, &sess->acg->acg_sess_list);