coypoop

diff --git a/sys/kern/vfs_wapbl.c b/sys/kern/vfs_wapbl.c
index 378b0ba..24cdaf5 100644
--- a/sys/kern/vfs_wapbl.c
+++ b/sys/kern/vfs_wapbl.c
@@ -349,9 +349,12 @@ wapbl_start_flush_inodes(struct wapbl *wl, struct wapbl_replay *wr)
 		    wr->wr_inodes[i].wr_imode);
 
 	/* Make sure new transaction won't overwrite old inodes list */
-	KDASSERT(wapbl_transaction_len(wl) <= 
+

coypoop

From e20bee1c96f0447d638b5929086ec53d3b82077a Mon Sep 17 00:00:00 2001
From: coypu <coypu@sdf.org>
Date: Tue, 3 May 2016 21:54:24 +0300
Subject: [PATCH 1/2] No need to panic on a too big transaction in wapbl_flush

We're already testing it in wapbl_truncate.
Add the detailed message to wapbl_truncate KASSERT.
---
 sys/kern/vfs_wapbl.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

coypoop

From d86d504a5b1eb6c1443f6161ba44d0fbd8bc90a1 Mon Sep 17 00:00:00 2001
From: coypu <coypu@sdf.org>
Date: Fri, 6 May 2016 19:06:43 +0300
Subject: [PATCH 1/2] Rename out2 to abort, more legible.

---
 sys/kern/vfs_wapbl.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/sys/kern/vfs_wapbl.c b/sys/kern/vfs_wapbl.c

coypoop

From c23ed9f6b1bbe0d7be4d78eb050c92d864a90b04 Mon Sep 17 00:00:00 2001
From: coypu <coypu@sdf.org>
Date: Fri, 6 May 2016 19:30:01 +0300
Subject: [PATCH 1/1] Explain what is happening better

---
 sys/kern/vfs_wapbl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/kern/vfs_wapbl.c b/sys/kern/vfs_wapbl.c

coypoop

From 3faeec917d0777ae302c5119d62b26ff8a559fbc Mon Sep 17 00:00:00 2001
From: coypu <coypu@sdf.org>
Date: Sat, 7 May 2016 06:41:23 +0300
Subject: [PATCH 1/1] Rename wapbl truncate to wapbl journal trim

this name is too similar to ffs truncate, but only
trims the journal.

suggested by dholland.
---

coypoop

You've partially applied this one:

From 3eb77263e8335b49a4bcb6b0fb5d5529bba630ed Mon Sep 17 00:00:00 2001
From: coypu <coypu@sdf.org>
Date: Sat, 7 May 2016 19:32:49 +0300
Subject: [PATCH 2/2] Split big KASSERT into two KASSERTs.

---
 sys/kern/vfs_wapbl.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

coypoop

From 9e0db7a82b84ab427d1485975a77205b3627a184 Mon Sep 17 00:00:00 2001
From: coypu <coypu@sdf.org>
Date: Sat, 7 May 2016 22:52:55 +0300
Subject: [PATCH 1/1] Turn WAPBL_DEBUG panic or KASSERT into KASSERTMSG

---
 sys/kern/vfs_wapbl.c | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/sys/kern/vfs_wapbl.c b/sys/kern/vfs_wapbl.c

coypoop

diff --git a/sys/kern/vfs_wapbl.c b/sys/kern/vfs_wapbl.c
index cbe1c99..9e1be8b 100644
--- a/sys/kern/vfs_wapbl.c
+++ b/sys/kern/vfs_wapbl.c
@@ -269,12 +269,6 @@ int wapbl_replay_verify(struct wapbl_replay *, struct vnode *);
 
 static int wapbl_replay_isopen1(struct wapbl_replay *);
 
-/*
- * This is useful for debugging.  If set, the log will

coypoop

@@ -1332,7 +1334,7 @@
        minfree -= avail;
        while ((wl->wl_error_count == 0) &&
            (wl->wl_reclaimable_bytes < minfree)) {
-               WAPBL_PRINTF(WAPBL_PRINT_TRUNCATE,
+               WAPBL_PRINTF(WAPBL_PRINT_JOURNAL_TRIM,
                    ("wapbl_truncate: sleeping on %p wl=%p bytes=%zd "
                    "minfree=%zd\n",
                     &wl->wl_reclaimable_bytes, wl, wl->wl_reclaimable_bytes,
@@ -1388,7 +1390,7 @@

coypoop

@@ -2136,8 +2146,8 @@
            FWRITE, FSCRED);
        if (error) {
                WAPBL_PRINTF(WAPBL_PRINT_ERROR,
-                   ("wapbl_cache_sync: DIOCCACHESYNC on dev 0x%x "
-                   "returned %d\n", wl->wl_devvp->v_rdev, error));
+                   ("wapbl_cache_sync: DIOCCACHESYNC on dev 0x%"PRIxMAX" "
+                   "returned %d\n", (uintmax_t) wl->wl_devvp->v_rdev, error));
        }
        if (verbose) {