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-15 18:22:57 -07:00
parent 481b641e64 7566e2ed71
commit 50efe30317
2 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
iscsi-scst/Makefile
View File

@@ -48,6 +48,7 @@ ifeq ($(INSTALL_MOD_PATH),)
endif
INSTALL_DIR := $(INSTALL_MOD_PATH)/lib/modules/$(KVER)/extra
INFINIBAND_ENABLED := $(shell if grep -q '^CONFIG_INFINIBAND=[my]$$' $(KDIR)/.config; then echo true; else echo false; fi)
all: include/iscsi_scst_itf_ver.h progs mods
@@ -102,7 +103,11 @@ 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
$(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 \
$(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:
$(MAKE) -C usr SCST_INC_DIR=$(SCST_INC_DIR)
@@ -123,9 +128,11 @@ install: all
$(MAKE) -C $(KDIR) SCST_INC_DIR=$(SCST_INC_DIR) SUBDIRS=$(KMOD) \
$$([ -n "$(DESTDIR)$(INSTALL_MOD_PATH)" ] && echo DEPMOD=true) \
modules_install
$(MAKE) -C $(KDIR) SCST_INC_DIR=$(SCST_INC_DIR) SUBDIRS=$(ISERTMOD) \
$$([ -n "$(DESTDIR)$(INSTALL_MOD_PATH)" ] && echo DEPMOD=true) \
modules_install
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
fi
uninstall:
rm -f $(DESTDIR)$(SBINDIR)/iscsi-scstd \
@@ -142,7 +149,9 @@ ifneq ($(SCST_MOD_VERS),)
Modules.symvers: $(SCST_DIR)/Modules.symvers
echo $(SCST_MOD_VERS)
cp $(SCST_DIR)/Modules.symvers kernel/
cp $(SCST_DIR)/Modules.symvers kernel/isert-scst
if $(INFINIBAND_ENABLED); then \
cp $(SCST_DIR)/Modules.symvers kernel/isert-scst; \
fi
else
.PHONY: Modules.symvers
endif
@@ -152,7 +161,9 @@ SCST_MOD_VERS := $(shell ls $(SCST_DIR)/Module.symvers 2>/dev/null)
ifneq ($(SCST_MOD_VERS),)
Module.symvers: $(SCST_DIR)/Module.symvers
cp $(SCST_DIR)/Module.symvers kernel/
cp $(SCST_DIR)/Module.symvers kernel/isert-scst
if $(INFINIBAND_ENABLED); then \
cp $(SCST_DIR)/Module.symvers kernel/isert-scst; \
fi
else
.PHONY: Module.symvers
endif

21
iscsi-scst/kernel/digest.c
View File

@@ -61,7 +61,6 @@ static __be32 evaluate_crc32_from_sg(struct scatterlist *sg, int nbytes,
uint32_t padding)
{
u32 crc = ~0;
int pad_bytes = ((nbytes + 3) & -4) - nbytes;
#ifdef CONFIG_SCST_ISCSI_DEBUG_DIGEST_FAILURES
if (((scst_random() % 100000) == 752)) {
@@ -71,15 +70,19 @@ static __be32 evaluate_crc32_from_sg(struct scatterlist *sg, int nbytes,
#endif
#if defined(CONFIG_LIBCRC32C_MODULE) || defined(CONFIG_LIBCRC32C)
while (nbytes > 0) {
int d = min(nbytes, (int)(sg->length));
crc = crc32c(crc, sg_virt(sg), d);
nbytes -= d;
sg++;
}
{
int pad_bytes = ((nbytes + 3) & -4) - nbytes;
if (pad_bytes)
crc = crc32c(crc, (u8 *)&padding, pad_bytes);
while (nbytes > 0) {
int d = min(nbytes, (int)(sg->length));
crc = crc32c(crc, sg_virt(sg), d);
nbytes -= d;
sg++;
}
if (pad_bytes)
crc = crc32c(crc, (u8 *)&padding, pad_bytes);
}
#endif
return (__force __be32)~cpu_to_le32(crc);