Merge pull request #200 from akiradeveloper/for-2.2.10

For 2.2.10
akiradeveloper · Nov 8, 2018 · 21571d6 · 21571d6
2 parents c23fed3 + b81784f
commit 21571d6
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 15 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2018-11-08  Akira Hayakawa  <ruby.wktk@gmail.com>
+
+	* v2.2.10
+	* Fix build error with 4.19 kernel
+
 2018-06-09  Akira Hayakawa  <ruby.wktk@gmail.com>
 
 	* v2.2.9

diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-MODULE_VERSION ?= 2.2.9
+MODULE_VERSION ?= 2.2.10
 DKMS_DIR := /usr/src/dm-writeboost-$(MODULE_VERSION)
 DKMS_KEY := -m dm-writeboost -v $(MODULE_VERSION)
 

diff --git a/src/dkms.conf b/src/dkms.conf
@@ -1,5 +1,5 @@
 PACKAGE_NAME="dm-writeboost"
-PACKAGE_VERSION="2.2.9"
+PACKAGE_VERSION="2.2.10"
 BUILT_MODULE_NAME="dm-writeboost"
 DEST_MODULE_LOCATION="/kernel/drivers/md"
 MAKE="make all KERNEL_TREE=$kernel_source_dir"

diff --git a/src/dm-writeboost-metadata.c b/src/dm-writeboost-metadata.c
@@ -438,13 +438,10 @@ static void zeroing_complete(int read_err, unsigned long write_err, void *contex
  */
 static int do_zeroing_region(struct wb_device *wb, struct dm_io_region *region)
 {
-	int err;
 	struct zeroing_context zc;
 	zc.error = 0;
 	init_completion(&zc.complete);
-	err = dm_kcopyd_zero(wb->copier, 1, region, 0, zeroing_complete, &zc);
-	if (err)
-		return err;
+	dm_kcopyd_zero(wb->copier, 1, region, 0, zeroing_complete, &zc);
 	wait_for_completion(&zc.complete);
 	return zc.error;
 }

diff --git a/src/dm-writeboost-target.c b/src/dm-writeboost-target.c
@@ -424,13 +424,13 @@ static void inc_stat(struct wb_device *wb,
 
 	int i = 0;
 	if (rw)
-		i |= (1 << STAT_WRITE);
+		i |= (1 << WB_STAT_WRITE);
 	if (found)
-		i |= (1 << STAT_HIT);
+		i |= (1 << WB_STAT_HIT);
 	if (on_buffer)
-		i |= (1 << STAT_ON_BUFFER);
+		i |= (1 << WB_STAT_ON_BUFFER);
 	if (fullsize)
-		i |= (1 << STAT_FULLSIZE);
+		i |= (1 << WB_STAT_FULLSIZE);
 
 	v = &wb->stat[i];
 	atomic64_inc(v);
@@ -1947,7 +1947,7 @@ static void writeboost_status(struct dm_target *ti, status_type_t type,
 
 static struct target_type writeboost_target = {
 	.name = "writeboost",
-	.version = {2, 2, 9},
+	.version = {2, 2, 10},
 	.module = THIS_MODULE,
 	.map = writeboost_map,
 	.end_io = writeboost_end_io,

diff --git a/src/dm-writeboost.h b/src/dm-writeboost.h
@@ -232,10 +232,10 @@ struct read_cache_cells {
 /*----------------------------------------------------------------------------*/
 
 enum STATFLAG {
-	STAT_WRITE = 3, /* Write or read */
-	STAT_HIT = 2, /* Hit or miss */
-	STAT_ON_BUFFER = 1, /* Found on buffer or on the cache device */
-	STAT_FULLSIZE = 0, /* Bio is fullsize or partial */
+	WB_STAT_WRITE = 3, /* Write or read */
+	WB_STAT_HIT = 2, /* Hit or miss */
+	WB_STAT_ON_BUFFER = 1, /* Found on buffer or on the cache device */
+	WB_STAT_FULLSIZE = 0, /* Bio is fullsize or partial */
 };
 #define STATLEN (1 << 4)