diff --git a/CHANGELOG.md b/CHANGELOG.md index 7052c64..74f30cd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +### Release 5.2 ### + +- kernel: added support for 4.17 kernel. +- build: Cleaned up module clean Makefile. +- Updated Copyright years. + ### Release 5.1 ### - kernel: added support for 4.13 kernel. diff --git a/conf/rapiddisk.sh.pacemaker b/conf/rapiddisk.sh.pacemaker index 0ded3d7..c1935b6 100755 --- a/conf/rapiddisk.sh.pacemaker +++ b/conf/rapiddisk.sh.pacemaker @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (C) 2015 Petros Koutoupis. All rights reserved. +# Copyright (C) 2015-2018 Petros Koutoupis. All rights reserved. # PATH=/bin:/sbin:/usr/bin:/usr/sbin diff --git a/conf/rapiddisk.sh.rgmanager b/conf/rapiddisk.sh.rgmanager index 836f3df..00c3cdf 100755 --- a/conf/rapiddisk.sh.rgmanager +++ b/conf/rapiddisk.sh.rgmanager @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (C) 2015 Petros Koutoupis. All rights reserved. +# Copyright (C) 2015 - 2018 Petros Koutoupis. All rights reserved. # PATH=/bin:/sbin:/usr/bin:/usr/sbin diff --git a/module/Makefile b/module/Makefile index 89bbea1..836ceca 100644 --- a/module/Makefile +++ b/module/Makefile @@ -1,4 +1,4 @@ -# Copyright © 2011-2017 Petros Koutoupis +# Copyright © 2011-2018 Petros Koutoupis # All rights reserved. # # This program is free software: you can redistribute it and/or modify @@ -13,7 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -VERSION = 5.1 +VERSION = 5.2 ifeq ($(KSRC),) KSRC := /lib/modules/$(shell uname -r)/build @@ -44,7 +44,7 @@ uninstall: clean: rm -rf *.o *.ko *.symvers *.mod.c .*.cmd Module.markers modules.order - rm -rf .tmp_versions .rapiddisk.o.d *.unsigned *.sdtinfo.c .ctf/ + rm -rf .tmp_versions .rapiddisk.o.d *.unsigned *.sdtinfo.c .ctf/ .cache.mk .PHONY: dkms dkms: diff --git a/module/dkms.conf b/module/dkms.conf index 23d8bab..876908a 100644 --- a/module/dkms.conf +++ b/module/dkms.conf @@ -1,5 +1,5 @@ PACKAGE_NAME="rapiddisk" -PACKAGE_VERSION="5.1" +PACKAGE_VERSION="5.2" BUILT_MODULE_NAME[0]="rapiddisk" BUILT_MODULE_NAME[1]="rapiddisk-cache" DEST_MODULE_LOCATION[0]="/kernel/rapiddisk/" diff --git a/module/rapiddisk-cache.c b/module/rapiddisk-cache.c index d09ade5..430dff3 100644 --- a/module/rapiddisk-cache.c +++ b/module/rapiddisk-cache.c @@ -1,5 +1,5 @@ /******************************************************************************* - ** Copyright © 2011-2017 Petros Koutoupis + ** Copyright © 2011-2018 Petros Koutoupis ** All rights reserved. ** ** This program is free software: you can redistribute it and/or modify @@ -57,7 +57,7 @@ } \ } while (0) -#define VERSION_STR "5.1" +#define VERSION_STR "5.2" #define DM_MSG_PREFIX "rapiddisk-cache" #define READCACHE 1 @@ -1236,7 +1236,7 @@ cache_status(struct dm_target *ti, status_type_t type, unsigned status_flags, static struct target_type cache_target = { .name = "rapiddisk-cache", - .version = {5, 1, 0}, + .version = {5, 2, 0}, .module = THIS_MODULE, .ctr = cache_ctr, .dtr = cache_dtr, @@ -1278,4 +1278,4 @@ MODULE_LICENSE("GPL"); MODULE_AUTHOR("Petros Koutoupis "); MODULE_DESCRIPTION("RapidDisk-Cache DM target is a write-through caching target with RapidDisk volumes."); MODULE_VERSION(VERSION_STR); -MODULE_INFO(Copyright, "Copyright 2010 - 2017 Petros Koutoupis"); +MODULE_INFO(Copyright, "Copyright 2010 - 2018 Petros Koutoupis"); diff --git a/module/rapiddisk.c b/module/rapiddisk.c index c71b337..607c1db 100644 --- a/module/rapiddisk.c +++ b/module/rapiddisk.c @@ -1,5 +1,5 @@ /******************************************************************************* - ** Copyright © 2011-2017 Petros Koutoupis + ** Copyright © 2011-2018 Petros Koutoupis ** All rights reserved. ** ** This program is free software: you can redistribute it and/or modify @@ -39,7 +39,7 @@ #include #include -#define VERSION_STR "5.1" +#define VERSION_STR "5.2" #define PREFIX "rapiddisk" #define BYTES_PER_SECTOR 512 #define MAX_RDSKS 128 @@ -723,9 +723,17 @@ static int attach_device(int size) rdsk->rdsk_queue->limits.discard_zeroes_data = 1; #endif rdsk->rdsk_queue->limits.max_discard_sectors = UINT_MAX; +#if LINUX_VERSION_CODE < KERNEL_VERSION(4,17,0) queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, rdsk->rdsk_queue); +#else + blk_queue_flag_set(QUEUE_FLAG_DISCARD, rdsk->rdsk_queue); +#endif #endif +#if LINUX_VERSION_CODE < KERNEL_VERSION(4,17,0) queue_flag_set_unlocked(QUEUE_FLAG_NONROT, rdsk->rdsk_queue); +#else + blk_queue_flag_set(QUEUE_FLAG_NONROT, rdsk->rdsk_queue); +#endif disk = rdsk->rdsk_disk = alloc_disk(1); if (!disk) @@ -847,4 +855,4 @@ MODULE_LICENSE("GPL"); MODULE_AUTHOR("Petros Koutoupis "); MODULE_DESCRIPTION("RapidDisk is an enhanced RAM disk block device driver."); MODULE_VERSION(VERSION_STR); -MODULE_INFO(Copyright, "Copyright 2010 - 2017 Petros Koutoupis"); +MODULE_INFO(Copyright, "Copyright 2010 - 2018 Petros Koutoupis"); diff --git a/pkg-mgmt/debian/changelog b/pkg-mgmt/debian/changelog index 8e14e0d..9e8ab51 100644 --- a/pkg-mgmt/debian/changelog +++ b/pkg-mgmt/debian/changelog @@ -1,3 +1,9 @@ +rapiddisk (5.2-1) released; urgency=medium + +* kernel: added support for 4.17 kernel. +* build: Cleaned up module clean Makefile. +* Updated copyright years. + rapiddisk (5.1-1) released; urgency=medium * kernel: added support for 4.13 kernel. diff --git a/pkg-mgmt/debian/control b/pkg-mgmt/debian/control index 6f84364..290278e 100755 --- a/pkg-mgmt/debian/control +++ b/pkg-mgmt/debian/control @@ -1,5 +1,5 @@ Package: rapiddisk -Version: 5.1-1 +Version: 5.2-1 Section: base Priority: optional Architecture: amd64 diff --git a/pkg-mgmt/debian/postinst b/pkg-mgmt/debian/postinst index d18bc96..68ccf4e 100755 --- a/pkg-mgmt/debian/postinst +++ b/pkg-mgmt/debian/postinst @@ -16,9 +16,9 @@ fi case "$1" in configure) - dkms add -m rapiddisk -v 5.1 - dkms build -m rapiddisk -v 5.1 - dkms install -m rapiddisk -v 5.1 + dkms add -m rapiddisk -v 5.2 + dkms build -m rapiddisk -v 5.2 + dkms install -m rapiddisk -v 5.2 echo "rapiddisk max_sectors=2048 nr_requests=1024" >> /etc/modules echo "rapiddisk-cache" >> /etc/modules echo "dm_mod" >> /etc/modules diff --git a/pkg-mgmt/debian/prerm b/pkg-mgmt/debian/prerm index 15d07e2..22d95b0 100755 --- a/pkg-mgmt/debian/prerm +++ b/pkg-mgmt/debian/prerm @@ -14,7 +14,7 @@ fi case "$1" in remove|upgrade|deconfigure) - dkms remove -m rapiddisk -v 5.1 --all + dkms remove -m rapiddisk -v 5.2 --all ;; failed-upgrade) diff --git a/pkg-mgmt/spec/rapiddisk.spec.opensuse b/pkg-mgmt/spec/rapiddisk.spec.opensuse index 3c354ae..c95826c 100644 --- a/pkg-mgmt/spec/rapiddisk.spec.opensuse +++ b/pkg-mgmt/spec/rapiddisk.spec.opensuse @@ -1,6 +1,6 @@ Summary: The RapidDisk software defined advanced RAM drive and storage caching solution. Name: rapiddisk -Version: 5.1 +Version: 5.2 Release: 1 License: General Public License Version 2 Group: Applications/System @@ -81,6 +81,10 @@ rm -rf %{buildroot} %doc %attr(0444,root,root) /usr/share/man/man1/* %changelog +* Mon May 25 2018 Petros Koutoupis +- kernel: added support for 4.17 kernel. +- build: Cleaned up module clean Makefile. +- Updated copyright years. * Mon Sep 4 2017 Petros Koutoupis - kernel: added support for 4.13 kernel. - kernel: added support for 4.12 kernel (thank you Marcel Huber). diff --git a/pkg-mgmt/spec/rapiddisk.spec.rhel6 b/pkg-mgmt/spec/rapiddisk.spec.rhel6 index 1c2ec34..af6d886 100644 --- a/pkg-mgmt/spec/rapiddisk.spec.rhel6 +++ b/pkg-mgmt/spec/rapiddisk.spec.rhel6 @@ -1,6 +1,6 @@ Summary: The RapidDisk software defined advanced RAM drive and storage caching solution. Name: rapiddisk -Version: 5.1 +Version: 5.2 Release: 1 License: General Public License Version 2 Group: Applications/System @@ -81,6 +81,10 @@ rm -rf %{buildroot} %doc %attr(0444,root,root) /usr/share/man/man1/* %changelog +* Mon May 25 2018 Petros Koutoupis +- kernel: added support for 4.17 kernel. +- build: Cleaned up module clean Makefile. +- Updated copyright years. * Mon Sep 4 2017 Petros Koutoupis - kernel: added support for 4.13 kernel. - kernel: added support for 4.12 kernel (thank you Marcel Huber). diff --git a/pkg-mgmt/spec/rapiddisk.spec.rhel7+ b/pkg-mgmt/spec/rapiddisk.spec.rhel7+ index 58f429d..abf8dd6 100644 --- a/pkg-mgmt/spec/rapiddisk.spec.rhel7+ +++ b/pkg-mgmt/spec/rapiddisk.spec.rhel7+ @@ -1,6 +1,6 @@ Summary: The RapidDisk software defined advanced RAM drive and storage caching solution. Name: rapiddisk -Version: 5.1 +Version: 5.2 Release: 1 License: General Public License Version 2 Group: Applications/System @@ -81,6 +81,10 @@ rm -rf %{buildroot} %doc %attr(0444,root,root) /usr/share/man/man1/* %changelog +* Mon May 25 2018 Petros Koutoupis +- kernel: added support for 4.17 kernel. +- build: Cleaned up module clean Makefile. +- Updated copyright years. * Mon Sep 4 2017 Petros Koutoupis - kernel: added support for 4.13 kernel. - kernel: added support for 4.12 kernel (thank you Marcel Huber). diff --git a/src/Makefile b/src/Makefile index 188a5d6..30ffe18 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,4 +1,4 @@ -# Copyright © 2011-2017 Petros Koutoupis +# Copyright © 2011 - 2018 Petros Koutoupis # All rights reserved. # # This file is part of RapidDisk. diff --git a/src/archive.c b/src/archive.c index 334bf8f..8701ed8 100644 --- a/src/archive.c +++ b/src/archive.c @@ -1,5 +1,5 @@ /********************************************************************************* - ** Copyright © 2011-2017 Petros Koutoupis + ** Copyright © 2011 - 2018 Petros Koutoupis ** All rights reserved. ** ** This file is part of RapidDisk. diff --git a/src/common.h b/src/common.h index 2e31cce..48bdc10 100644 --- a/src/common.h +++ b/src/common.h @@ -1,5 +1,5 @@ /********************************************************************************* - ** Copyright © 2011-2017 Petros Koutoupis + ** Copyright © 2011 - 2018 Petros Koutoupis ** All rights reserved. ** ** This file is part of RapidDisk. @@ -40,8 +40,8 @@ #include #define UTIL "rapiddisk" -#define COPYRIGHT "Copyright 2011-2017 Petros Koutoupis" -#define VERSION_NUM "5.1" +#define COPYRIGHT "Copyright 2011 - 2018 Petros Koutoupis" +#define VERSION_NUM "5.2" #define SUCCESS 0x0 #define NAMELEN 0x100 #define BYTES_PER_SECTOR 0x200 diff --git a/src/core.c b/src/core.c index 48f0b4a..25b8362 100644 --- a/src/core.c +++ b/src/core.c @@ -1,5 +1,5 @@ /********************************************************************************* - ** Copyright © 2011-2017 Petros Koutoupis + ** Copyright © 2011 - 2018 Petros Koutoupis ** All rights reserved. ** ** This file is part of RapidDisk. diff --git a/src/crypt.c b/src/crypt.c index 73676e7..9f534ec 100644 --- a/src/crypt.c +++ b/src/crypt.c @@ -1,5 +1,5 @@ /********************************************************************************* - ** Copyright © 2011-2017 Petros Koutoupis + ** Copyright © 2011 - 2018 Petros Koutoupis ** All rights reserved. ** ** This file is part of RapidDisk. diff --git a/src/main.c b/src/main.c index aa753a8..e49759b 100644 --- a/src/main.c +++ b/src/main.c @@ -1,5 +1,5 @@ /********************************************************************************* - ** Copyright © 2011-2017 Petros Koutoupis + ** Copyright © 2011 - 2018 Petros Koutoupis ** All rights reserved. ** ** This file is part of RapidDisk. diff --git a/test/Makefile b/test/Makefile index 9981a68..7e77e81 100644 --- a/test/Makefile +++ b/test/Makefile @@ -1,4 +1,4 @@ -# Copyright © 2016 -2017 Petros Koutoupis +# Copyright © 2016 - 2018 Petros Koutoupis # All rights reserved. # # This program is free software: you can redistribute it and/or modify diff --git a/test/rxflush.c b/test/rxflush.c index 7919bb0..fc77ab9 100644 --- a/test/rxflush.c +++ b/test/rxflush.c @@ -1,6 +1,6 @@ /* rxio.c */ -/** Copyright © 2016 Petros Koutoupis +/** Copyright © 2016 - 2018 Petros Koutoupis ** All rights reserved. ** ** This program is free software: you can redistribute it and/or modify diff --git a/test/rxio.c b/test/rxio.c index 4b3ebfb..01d0a65 100644 --- a/test/rxio.c +++ b/test/rxio.c @@ -1,6 +1,6 @@ /* rxio.c */ -/** Copyright © 2016 - 2017 Petros Koutoupis +/** Copyright © 2016 - 2018 Petros Koutoupis ** All rights reserved. ** ** This program is free software: you can redistribute it and/or modify diff --git a/test/rxioctl.c b/test/rxioctl.c index 68e30e1..26d92fd 100644 --- a/test/rxioctl.c +++ b/test/rxioctl.c @@ -1,6 +1,6 @@ /* rxio.c */ -/** Copyright © 2016 - 2017 Petros Koutoupis +/** Copyright © 2016 - 2018 Petros Koutoupis ** All rights reserved. ** ** This program is free software: you can redistribute it and/or modify