aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Houchard <cognet@FreeBSD.org>2017-02-28 23:30:14 +0000
committerOlivier Houchard <cognet@FreeBSD.org>2017-02-28 23:30:14 +0000
commit08c22689e662f3091ba410c950367f0769c92995 (patch)
treefe753553dd884bbdeee7a6411d2518036261e583
parent9907aba3704685d2ab7138204fe99a81a312d62d (diff)
parent9f13174209805996408a614a396c3ba7f0bac6a7 (diff)
downloadsrc-08c22689e662f3091ba410c950367f0769c92995.tar.gz
src-08c22689e662f3091ba410c950367f0769c92995.zip
Merge CK as of commit 24d26965d1a28039062ba3bcf9433b623f3d2c5e, to get
a fix in ck_epoch.
Notes
Notes: svn path=/head/; revision=314435
-rw-r--r--sys/contrib/ck/include/ck_md.h2
-rw-r--r--sys/contrib/ck/src/ck_epoch.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/sys/contrib/ck/include/ck_md.h b/sys/contrib/ck/include/ck_md.h
index 83174540276f..22b1e6a22bec 100644
--- a/sys/contrib/ck/include/ck_md.h
+++ b/sys/contrib/ck/include/ck_md.h
@@ -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 ""
/*
diff --git a/sys/contrib/ck/src/ck_epoch.c b/sys/contrib/ck/src/ck_epoch.c
index 7cddfa7597c6..a0e9180a1fdc 100644
--- a/sys/contrib/ck/src/ck_epoch.c
+++ b/sys/contrib/ck/src/ck_epoch.c
@@ -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) {