 @@ -1,14 +1,14 @@
-/*	$NetBSD: vfs_wapbl.c,v 1.55 2013/02/09 00:32:12 christos Exp $	*/
+/*	$NetBSD: vfs_wapbl.c,v 1.56 2013/09/14 13:19:50 joerg Exp $	*/
 /*-
  * Copyright (c) 2003, 2008, 2009 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Wasabi Systems, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -26,27 +26,27 @@
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * This implements file system independent write ahead filesystem logging.
  */
 #define WAPBL_INTERNAL
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_wapbl.c,v 1.55 2013/02/09 00:32:12 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_wapbl.c,v 1.56 2013/09/14 13:19:50 joerg Exp $");
 #include <sys/param.h>
 #include <sys/bitops.h>
 #ifdef _KERNEL
 #include <sys/param.h>
 #include <sys/namei.h>
 #include <sys/proc.h>
 #include <sys/sysctl.h>
 #include <sys/uio.h>
 #include <sys/vnode.h>
 #include <sys/file.h>
 #include <sys/module.h>
 @@ -199,28 +199,26 @@ int wapbl_debug_print = WAPBL_DEBUG_PRIN
 #ifdef WAPBL_DEBUG
 struct wapbl *wapbl_debug_wl;
 #endif
 static int wapbl_write_commit(struct wapbl *wl, off_t head, off_t tail);
 static int wapbl_write_blocks(struct wapbl *wl, off_t *offp);
 static int wapbl_write_revocations(struct wapbl *wl, off_t *offp);
 static int wapbl_write_inodes(struct wapbl *wl, off_t *offp);
 #endif /* _KERNEL */
 static int wapbl_replay_process(struct wapbl_replay *wr, off_t, off_t);
 static inline size_t wapbl_space_free(size_t avail, off_t head,
 	off_t tail);
 static inline size_t wapbl_space_used(size_t avail, off_t head,
 	off_t tail);
 #ifdef _KERNEL
 static struct pool wapbl_entry_pool;
 #define	WAPBL_INODETRK_SIZE 83
 static int wapbl_ino_pool_refcount;
 static struct pool wapbl_ino_pool;
 struct wapbl_ino {
 	LIST_ENTRY(wapbl_ino) wi_hash;
 	ino_t wi_ino;
 @@ -1114,26 +1112,38 @@ wapbl_resize_buf(struct wapbl *wl, struc
 	if (bp->b_flags & B_LOCKED) {
 		mutex_enter(&wl->wl_mtx);
 		wl->wl_bufbytes += bp->b_bufsize - oldsz;
 		wl->wl_bcount += bp->b_bcount - oldcnt;
 		mutex_exit(&wl->wl_mtx);
+	}
+}
 #endif /* _KERNEL */
 /****************************************************************/
 /* Some utility inlines */
 static inline size_t
 wapbl_space_used(size_t avail, off_t head, off_t tail)
+{
 	if (tail == 0) {
 		KASSERT(head == 0);
 		return 0;
+	}
 	return ((head + (avail - 1) - tail) % avail) + 1;
+}
 #ifdef _KERNEL
 /* This is used to advance the pointer at old to new value at old+delta */
 static inline off_t
 wapbl_advance(size_t size, size_t off, off_t old, size_t delta)
+{
 	off_t new;
 	/* Define acceptable ranges for inputs. */
 	KASSERT(delta <= (size_t)size);
 	KASSERT((old == 0) || ((size_t)old >= off));
 	KASSERT(old < (off_t)(size + off));
 	if ((old == 0) && (delta != 0))
 		new = off + delta;
 @@ -1144,37 +1154,26 @@ wapbl_advance(size_t size, size_t off, o
 	/* Note some interesting axioms */
 	KASSERT((delta != 0) || (new == old));
 	KASSERT((delta == 0) || (new != 0));
 	KASSERT((delta != (size)) || (new == old));
 	/* Define acceptable ranges for output. */
 	KASSERT((new == 0) || ((size_t)new >= off));
 	KASSERT((size_t)new < (size + off));
 	return new;
+}
 static inline size_t
 wapbl_space_used(size_t avail, off_t head, off_t tail)
 	if (tail == 0) {
 		KASSERT(head == 0);
 		return 0;
 	return ((head + (avail - 1) - tail) % avail) + 1;
 static inline size_t
 wapbl_space_free(size_t avail, off_t head, off_t tail)
+{
 	return avail - wapbl_space_used(avail, head, tail);
+}
 static inline void
 wapbl_advance_head(size_t size, size_t off, size_t delta, off_t *headp,
 		   off_t *tailp)
+{
 	off_t head = *headp;
 	off_t tail = *tailp;
 @@ -1192,27 +1191,26 @@ wapbl_advance_tail(size_t size, size_t o
+{
 	off_t head = *headp;
 	off_t tail = *tailp;
 	KASSERT(delta <= wapbl_space_used(size, head, tail));
 	tail = wapbl_advance(size, off, tail, delta);
 	if (head == tail) {
 		head = tail = 0;
+	}
 	*headp = head;
 	*tailp = tail;
+}
 #ifdef _KERNEL
 /****************************************************************/
 /*
  * Remove transactions whose buffers are completely flushed to disk.
  * Will block until at least minfree space is available.
  * only intended to be called from inside wapbl_flush and therefore
  * does not protect against commit races with itself or with flush.
  */
 static int
 wapbl_truncate(struct wapbl *wl, size_t minfree, int waitonly)
+{
 	size_t delta;