mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-20 12:11:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'svn-trunk'

Browse Source
This commit is contained in:
Bart Van Assche
2018-04-03 19:32:07 -07:00
parent 9bcc808421 c4125d9b26
commit e252b1efef
3 changed files with 16 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@@ -40,8 +40,8 @@ endif
SCST_DIR=scst
DOC_DIR=doc
SCSTADM_DIR=scstadmin
QLA_INI_DIR=qla2x00t_git
QLA_DIR=qla2x00t_git/qla2x00-target
QLA_DIR=qla2xxx-unified-target
QLA_GIT_DIR=qla2x00t_git/scst-qla2xxx-unified
QLA_OLD_INI_DIR=qla2x00t
QLA_OLD_DIR=qla2x00t/qla2x00-target
LSI_DIR=mpt
@@ -185,7 +185,6 @@ uninstall:
clean:
cd $(SCST_DIR) && $(MAKE) $@
@if [ -d $(DOC_DIR) ]; then cd $(DOC_DIR) && $(MAKE) $@; fi
@if [ -d $(QLA_INI_DIR) ]; then cd $(QLA_INI_DIR) && $(MAKE) $@; fi
@if [ -d $(QLA_DIR) ]; then cd $(QLA_DIR) && $(MAKE) $@; fi
@if [ -d $(QLA_OLD_INI_DIR) ]; then cd $(QLA_OLD_INI_DIR) && $(MAKE) $@; fi
@if [ -d $(QLA_OLD_DIR) ]; then cd $(QLA_OLD_DIR) && $(MAKE) $@; fi
@@ -200,7 +199,6 @@ extraclean:
-rm -f TAGS tags cscope.out
cd $(SCST_DIR) && $(MAKE) $@
@if [ -d $(DOC_DIR) ]; then cd $(DOC_DIR) && $(MAKE) $@; fi
@if [ -d $(QLA_INI_DIR) ]; then cd $(QLA_INI_DIR) && $(MAKE) $@; fi
@if [ -d $(QLA_DIR) ]; then cd $(QLA_DIR) && $(MAKE) $@; fi
@if [ -d $(QLA_OLD_INI_DIR) ]; then cd $(QLA_OLD_INI_DIR) && $(MAKE) $@; fi
@if [ -d $(QLA_OLD_DIR) ]; then cd $(QLA_OLD_DIR) && $(MAKE) $@; fi
@@ -257,7 +255,7 @@ qla:
cd $(QLA_DIR) && $(MAKE) all
qla_pull:
cd $(QLA_INI_DIR) && git pull
cd $(QLA_GIT_DIR) && git pull
qla_install:
cd $(QLA_DIR) && $(MAKE) install
@@ -266,11 +264,9 @@ qla_uninstall:
cd $(QLA_DIR) && $(MAKE) uninstall
qla_clean:
cd $(QLA_INI_DIR) && $(MAKE) clean
cd $(QLA_DIR) && $(MAKE) clean
qla_extraclean:
cd $(QLA_INI_DIR) && pwd && $(MAKE) extraclean
cd $(QLA_DIR) && $(MAKE) extraclean
qla_old:

35
README
View File

@@ -33,33 +33,20 @@ QLogic target driver
QLogic target driver qla2x00t is the old driver, forked from qla2xxx
several years ago. It is very stable, well tested and actively used in
many production setups. The ultimate goal is to have the mainstream
(git) QLogic target driver to be the main and the only QLogic target
driver, but, unfortunately, this driver not yet reached level of quality
and maturity of qla2x00t. We with QLogic are working toward it.
many production setups.
You can find the latest version of the git driver in git://git.qlogic.com/scst-qla2xxx.git.
It is maintained by QLogic, hence located in the QLogic's git.
There is also new driver, maintained by QLogic, which, among other,
supports 32G FC, see http://scst.sourceforge.net/target_qla2x00t.html.
You can find the latest version of it in git://git.qlogic.com/scst-qla2xxx.git.
To integrate it into the SCST build tree you need:
To integrate it into the SCST build tree you need to clone the QLogic
git tree in a subdirectory of this directory (SCST root tree) with name
qla2x00t_git (or create a symlink with this name pointing to any other
location in your system).
1. Clone the QLogic git tree somewhere in your system.
2. Create in the SCST root, i.e. this directory, a subdirectory with name
qla2x00t_git
3. Optional for the in-tree build: symlink drivers/scsi/qla2xxx
subdirectory in the cloned git tree to the qla2x00t_git subdirectory
Thats all. Now common and QLA specific root Makefile targets "magically"
start working with the new driver.
For detail instructions how to setup QLA target build environment see
its README or HOWTO. Run either "make all" to build the SCST core and
all target drivers with in-tree QLogic drivers, or the following command
with standalone QLogic drivers:
BUILD_2X_MODULE=y CONFIG_SCSI_QLA_FC=y CONFIG_SCSI_QLA2XXX_TARGET=y make all
Now common and QLA specific root Makefile targets "magically" start
working with the new driver. Then follow instructions in the git's
README.
In presence of qla2x00t_git subdirectory you can still build the
qla2x00t using qla_old* root Makefile targets.

3
scst/src/dev_handlers/scst_vdisk.c
View File

@@ -963,7 +963,8 @@ static struct file *vdev_open_fd(const struct scst_vdisk_dev *virt_dev,
sBUG_ON(!name);
if (!virt_dev->dev_active) {
TRACE_MGMT_DBG("Skip openning for not active dev %s", virt_dev->dev->virt_name);
TRACE_MGMT_DBG("Skip opening for not active dev %s",
virt_dev->dev->virt_name);
fd = ERR_PTR(-EMEDIUMTYPE);
goto out;
}