Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKernel Build Daemon <kbuild@suse.de>2019-07-08 07:01:09 +0200
committerKernel Build Daemon <kbuild@suse.de>2019-07-08 07:01:09 +0200
commit8d049c67d0cb1fdfa6fa08967c2c2ed6c0bb5c8f (patch)
tree877732ac9f7ef045128c7c6ed0a9676b5a03c5c7
parentae16cdd1bb4b0e1e6d0dc45e74b2f78308dc71d6 (diff)
parent69ae3ca43446fccf6896c56018dbde1b9ca2e166 (diff)
Merge branch 'SLE15' into SLE15-AZURE
-rw-r--r--drivers/md/dm-table.c2
-rw-r--r--drivers/target/target_core_iblock.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
index d813011927fd..4340261b7744 100644
--- a/drivers/md/dm-table.c
+++ b/drivers/md/dm-table.c
@@ -905,7 +905,7 @@ static bool dm_table_supports_dax(struct dm_table *t)
return false;
if (!ti->type->iterate_devices ||
- !ti->type->iterate_devices(ti, device_supports_dax, NULL))
+ ti->type->iterate_devices(ti, device_supports_dax, NULL) < 0)
return false;
}
diff --git a/drivers/target/target_core_iblock.c b/drivers/target/target_core_iblock.c
index 60429011292a..3ffaac6a4dc6 100644
--- a/drivers/target/target_core_iblock.c
+++ b/drivers/target/target_core_iblock.c
@@ -517,7 +517,7 @@ iblock_execute_write_same(struct se_cmd *cmd)
/* Always in 512 byte units for Linux/Block */
block_lba += sg->length >> IBLOCK_LBA_SHIFT;
- sectors -= 1;
+ sectors -= sg->length >> IBLOCK_LBA_SHIFT;
}
iblock_submit_bios(&list);