svn commit: r314435 - in head/sys/contrib/ck: include src

[Olivier Houchard]

Author: cognet
Date: Tue Feb 28 23:30:14 2017
New Revision: 314435
URL: https://svnweb.freebsd.org/changeset/base/314435

Log:
  Merge CK as of commit 24d26965d1a28039062ba3bcf9433b623f3d2c5e, to get
  a fix in ck_epoch.

Modified:
  head/sys/contrib/ck/include/ck_md.h
  head/sys/contrib/ck/src/ck_epoch.c
Directory Properties:
  head/sys/contrib/ck/   (props changed)

Modified: head/sys/contrib/ck/include/ck_md.h
==============================================================================
--- head/sys/contrib/ck/include/ck_md.h	Tue Feb 28 23:26:59 2017	(r314434)
+++ head/sys/contrib/ck/include/ck_md.h	Tue Feb 28 23:30:14 2017	(r314435)
@@ -57,7 +57,7 @@
 #define CK_MD_RMO
 #endif /* CK_MD_RMO */
 
-#define CK_VERSION "0.5.2"
+#define CK_VERSION "0.6.0"
 #define CK_GIT_SHA ""
 
 /*

Modified: head/sys/contrib/ck/src/ck_epoch.c
==============================================================================
--- head/sys/contrib/ck/src/ck_epoch.c	Tue Feb 28 23:26:59 2017	(r314434)
+++ head/sys/contrib/ck/src/ck_epoch.c	Tue Feb 28 23:30:14 2017	(r314435)
@@ -309,11 +309,12 @@ ck_epoch_scan(struct ck_epoch *global,
 {
 	ck_stack_entry_t *cursor;
 
-	*af = false;
 	if (cr == NULL) {
 		cursor = CK_STACK_FIRST(&global->records);
+		*af = false;
 	} else {
 		cursor = &cr->record_next;
+		*af = true;
 	}
 
 	while (cursor != NULL) {