 @@ -1,14 +1,14 @@
-/*	$NetBSD: vfs_wapbl.c,v 1.6 2008/11/11 08:29:58 joerg Exp $	*/
+/*	$NetBSD: vfs_wapbl.c,v 1.7 2008/11/17 19:31:47 joerg Exp $	*/
 /*-
  * Copyright (c) 2003,2008 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.6 2008/11/11 08:29:58 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_wapbl.c,v 1.7 2008/11/17 19:31:47 joerg Exp $");
 #include <sys/param.h>
 #ifdef _KERNEL
 #include <sys/param.h>
 #include <sys/namei.h>
 #include <sys/proc.h>
 #include <sys/uio.h>
 #include <sys/vnode.h>
 #include <sys/file.h>
 #include <sys/malloc.h>
 #include <sys/resourcevar.h>
 #include <sys/conf.h>
 @@ -1912,26 +1912,27 @@ wapbl_write_commit(struct wapbl *wl, off
+}
 /* Returns new offset value */
 static int
 wapbl_write_blocks(struct wapbl *wl, off_t *offp)
+{
 	struct wapbl_wc_blocklist *wc =
 	    (struct wapbl_wc_blocklist *)wl->wl_wc_scratch;
 	int blocklen = 1<<wl->wl_log_dev_bshift;
 	int bph;
 	struct buf *bp;
 	off_t off = *offp;
 	int error;
 	size_t padding;
 	KASSERT(rw_write_held(&wl->wl_rwlock));
 	bph = (blocklen - offsetof(struct wapbl_wc_blocklist, wc_blocks)) /
 	    sizeof(((struct wapbl_wc_blocklist *)0)->wc_blocks[0]);
 	bp = LIST_FIRST(&wl->wl_bufs);
 	while (bp) {
 		int cnt;
 		struct buf *obp = bp;
 		KASSERT(bp->b_flags & B_LOCKED);
 @@ -1952,42 +1953,60 @@ wapbl_write_blocks(struct wapbl *wl, off
 			 * bwrite when the vnode lock should already be held
 			 * by the invoking code.
 			 */
 			KASSERT((bp->b_vp->v_type == VBLK) ||
 				 (bp->b_blkno != bp->b_lblkno));
 			KASSERT(bp->b_blkno > 0);
 			wc->wc_blocks[wc->wc_blkcount].wc_daddr = bp->b_blkno;
 			wc->wc_blocks[wc->wc_blkcount].wc_dlen = bp->b_bcount;
 			wc->wc_len += bp->b_bcount;
 			wc->wc_blkcount++;
 			bp = LIST_NEXT(bp, b_wapbllist);
+		}
 		if (wc->wc_len % blocklen != 0) {
 			printf("Padding WAPBL record...");
 			padding = blocklen - wc->wc_len % blocklen;
 			wc->wc_len += padding;
 		} else {
 			padding = 0;
+		}
 		WAPBL_PRINTF(WAPBL_PRINT_WRITE,
-		    ("wapbl_write_blocks: len = %u off = %"PRIdMAX"\n",
+		    ("wapbl_write_blocks: len = %u (padding %zu) off = %"PRIdMAX"\n",
-		    wc->wc_len, (intmax_t)off));
+		    wc->wc_len, padding, (intmax_t)off));
 		error = wapbl_circ_write(wl, wc, blocklen, &off);
 		if (error)
 			return error;
 		bp = obp;
 		cnt = 0;
 		while (bp && (cnt++ < bph)) {
 			error = wapbl_circ_write(wl, bp->b_data,
 			    bp->b_bcount, &off);
 			if (error)
 				return error;
 			bp = LIST_NEXT(bp, b_wapbllist);
+		}
 		if (padding) {
 			void *zero;
 			zero = wapbl_malloc(padding);
 			memset(zero, 0, padding);
 			error = wapbl_circ_write(wl, zero, padding, &off);
 			wapbl_free(zero);
 			if (error)
 				return error;
+		}
+	}
 	*offp = off;
 	return 0;
+}
 static int
 wapbl_write_revocations(struct wapbl *wl, off_t *offp)
+{
 	struct wapbl_wc_blocklist *wc =
 	    (struct wapbl_wc_blocklist *)wl->wl_wc_scratch;
 	int i;
 	int blocklen = 1<<wl->wl_log_dev_bshift;
 	int bph;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: wapbl.h,v 1.6 2008/11/15 10:04:31 joerg Exp $	*/
+/*	$NetBSD: wapbl.h,v 1.7 2008/11/17 19:31:47 joerg Exp $	*/
 /*-
  * Copyright (c) 2003,2008 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.
 @@ -87,29 +87,26 @@ extern int wapbl_debug_print;
+ *
  * The journal consists of a header followed by a circular buffer
  * region.  The circular data area is described by the header
  * wc_circ_off, wc_circ_size, wc_head and wc_tail fields as bytes
  * from the start of the journal header.  New records are inserted
  * at wc_head and the oldest valid record can be found at wc_tail.
  * When ((wc_head == wc_tail) && (wc_head == 0)), the journal is empty.
  * The condition of ((wc_head == wc_tail) && (wc_head != 0))
  * indicates a full journal, although this condition is rare.
+ *
  * The journal header as well as its records are marked by a 32bit
  * type tag and length for ease of parsing.  Journal records are
  * padded so as to fall on journal device block boundaries.
  * (XXX i think there is currently a bug wrt WC_BLOCKS not ending
  * correctly on a journal device block boundary. this would need
  * to be fixed if the journal blocksize does not match filesystem.)
  */
 /*
  * The following are the 4 record types used by the journal:
  * Each tag indicates journal data organized by one of the
  * structures used below.
  */
 enum {
 	WAPBL_WC_HEADER = 0x5741424c,	/* "WABL", struct wapbl_wc_header */
 	WAPBL_WC_INODES,		/* struct wapbl_wc_inodelist */
 	WAPBL_WC_REVOCATIONS,		/* struct wapbl_wc_blocklist */
 	WAPBL_WC_BLOCKS,		/* struct wapbl_wc_blocklist */
 };