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

Merge branch 'svn-trunk'

Browse Source
This commit is contained in:
Bart Van Assche
2015-06-16 19:48:12 -07:00
parent 6ab09ab073 cd0a7b7b9d
commit e89dfca7e4
8 changed files with 17 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
qla2x00t/qla_iocb.c
View File

@@ -409,9 +409,8 @@ qla2x00_start_scsi(srb_t *sp)
/* Set target ID and LUN number*/
SET_TARGET_ID(ha, cmd_pkt->target, sp->fcport->loop_id);
cmd_pkt->lun = cpu_to_le16(cmd->device->lun);
/* Update tagged queuing modifier */
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0)
/* Update tagged queuing modifier */
if (scsi_populate_tag_msg(cmd, tag)) {
switch (tag[0]) {
case HEAD_OF_QUEUE_TAG:
@@ -1402,11 +1401,10 @@ qla24xx_build_scsi_crc_2_iocbs(srb_t *sp, struct cmd_type_crc_2 *cmd_pkt,
cmd_pkt->fcp_cmnd_dseg_address[1] = cpu_to_le32(
MSD(crc_ctx_dma + CRC_CONTEXT_FCPCMND_OFF));
fcp_cmnd->task_management = 0;
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0)
/*
* Update tagged queuing modifier if using command tag queuing
*/
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0)
if (scsi_populate_tag_msg(cmd, tag)) {
switch (tag[0]) {
case HEAD_OF_QUEUE_TAG:

13
scst.spec.in
View File

@@ -133,12 +133,6 @@ rm -f /usr/local/man/man8/iscsi-scstd.8
rm -f /usr/local/sbin/iscsi-scst-adm
rm -f /usr/local/sbin/iscsi-scstd
rm -rf /usr/local/include/scst
rm -f /usr/local/man/man5/iscsi-scstd.conf.5
rm -f /usr/local/man/man8/iscsi-scst-adm.8
rm -f /usr/local/man/man8/iscsi-scstd.8
rm -f /usr/local/sbin/iscsi-scst-adm
rm -f /usr/local/sbin/iscsi-scstd
rm -rf /usr/local/include/scst
%post
/sbin/depmod -a %{kversion}
@@ -171,13 +165,6 @@ rm -rf /usr/local/include/scst
%{_sbindir}/iscsi-scstd
%dir /var/lib/scst/pr
%dir /var/lib/scst/vdev_mode_pages
%{_mandir}/man5/iscsi-scstd.conf.5.gz
%{_mandir}/man8/iscsi-scst-adm.8.gz
%{_mandir}/man8/iscsi-scstd.8.gz
%{_sbindir}/iscsi-scst-adm
%{_sbindir}/iscsi-scstd
%dir /var/lib/scst/pr
%dir /var/lib/scst/vdev_mode_pages
%files devel
%defattr(-,root,root)

4
scstadmin/Makefile
View File

@@ -83,6 +83,10 @@ install install_vendor:
fi \
fi \
done
# Remove the files that are obsolete since SCST-SCST has been
# renamed into SCST_SCST.
rm -rf "$(DESTDIR)$$(/usr/bin/perl -V:sitearch | sed "s|.*='||;s|'.*||")/auto/SCST-SCST"
# Install the files that have just been built.
install -d $(DESTDIR)$(INITDIR)
tmp=/tmp/scst-initd-$$$$ && init.d/scst >$$tmp && \
install -m 755 $$tmp $(DESTDIR)$(INITDIR)/scst && \

4
scstadmin/scstadmin.procfs/scst-0.8.22/Makefile.PL
View File

@@ -1,12 +1,12 @@
#!/usr/bin/perl -w
#
# Makefile for the SCST-SCST perl module
# Makefile for the SCST_SCST perl module
#
use ExtUtils::MakeMaker;
WriteMakefile(
'NAME' => 'SCST-SCST',
'NAME' => 'SCST_SCST',
'VERSION_FROM' => 'lib/SCST/SCST.pm',
'AUTHOR' => 'Mark R. Buechler <Mark.Buechler@gmail.com>',
'PREREQ_PM' => {},

6
scstadmin/scstadmin.procfs/scst-0.8.22/README
View File

@@ -1,15 +1,15 @@
SCST-SCST is a perl module for querying and configuring SCST.
SCST_SCST is a perl module for querying and configuring SCST.
AVAILABILITY
Currently SCST-SCST ships with SCST itself available from
Currently SCST_SCST ships with SCST itself available from
http://scst.sourceforge.net.
INSTALLATION
Install SCST-SCST as you would any other perl module:
Install SCST_SCST as you would any other perl module:
perl Makefile.PL
make

2
scstadmin/scstadmin.spec.in
View File

@@ -69,7 +69,7 @@ rm -f /usr/local/man/man5/scst.conf.5*
/etc/init.d/scst
%{_sbindir}/scstadmin
%{perl_vendorlib}/SCST
%{perl_vendorarch}/auto/SCST-SCST
%{perl_vendorarch}/auto/SCST_SCST
%{_mandir}/man1/scstadmin.1*
%{scstadmin_perl_installvendorman3dir}/SCST::SCST.3pm*
%{_mandir}/man5/scst.5*

4
scstadmin/scstadmin.sysfs/scst-0.9.10/Makefile.PL
View File

@@ -1,12 +1,12 @@
#!/usr/bin/perl -w
#
# Makefile for the SCST-SCST perl module
# Makefile for the SCST_SCST perl module
#
use ExtUtils::MakeMaker;
WriteMakefile(
'NAME' => 'SCST-SCST',
'NAME' => 'SCST_SCST',
'VERSION_FROM' => 'lib/SCST/SCST.pm',
'AUTHOR' => 'Mark R. Buechler <Mark.Buechler@gmail.com>',
'PREREQ_PM' => {},

6
scstadmin/scstadmin.sysfs/scst-0.9.10/README
View File

@@ -1,15 +1,15 @@
SCST-SCST is a perl module for querying and configuring SCST.
SCST_SCST is a perl module for querying and configuring SCST.
AVAILABILITY
Currently SCST-SCST ships with SCST itself available from
Currently SCST_SCST ships with SCST itself available from
http://scst.sourceforge.net.
INSTALLATION
Install SCST-SCST as you would any other perl module:
Install SCST_SCST as you would any other perl module:
perl Makefile.PL
make