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

Merge branch 'svn-trunk'

Browse Source
This commit is contained in:
Bart Van Assche
2021-09-08 20:26:28 -07:00
parent d296d3f507 13c6449016
commit ab318992fc
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
qla2x00t-32gbit/Makefile_in-tree
View File

@@ -1,8 +1,10 @@
# SPDX-License-Identifier: GPL-2.0
qla2xxx-y := qla_os.o qla_init.o qla_mbx.o qla_iocb.o qla_isr.o qla_gs.o \
qla2xxx-y := \
qla_os.o qla_init.o qla_mbx.o qla_iocb.o qla_isr.o qla_gs.o \
qla_dbg.o qla_sup.o qla_attr.o qla_mid.o qla_dfs.o qla_bsg.o \
qla_nx.o qla_mr.o qla_nx2.o qla_target.o qla_tmpl.o qla_nvme.o
qla_nx.o qla_mr.o qla_nx2.o qla_target.o qla_tmpl.o qla_nvme.o \
qla_edif.o
qla2x00tgt-objs := qla_tgt.o scst_qla2xxx.o
obj-$(CONFIG_SCSI_QLA_FC) += qla2xxx.o

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

@@ -5933,7 +5933,7 @@ static void vdisk_blk_add_dif(struct bio *bio, gfp_t gfp_mask,
}
bip = bio_integrity_alloc(bio, gfp_mask, pages);
if (unlikely(bip == NULL)) {
if (unlikely(IS_ERR_OR_NULL(bip))) {
PRINT_WARNING("Allocation of %d pages for DIF tags "
"failed! (dev %s)", pages, dev->virt_name);
goto out; /* proceed without integrity */