 @@ -1,14 +1,14 @@
-/*	$NetBSD: vfs_wapbl.c,v 1.47 2011/09/01 09:03:43 christos Exp $	*/
+/*	$NetBSD: vfs_wapbl.c,v 1.48 2011/12/02 12:38:59 yamt 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.47 2011/09/01 09:03:43 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_wapbl.c,v 1.48 2011/12/02 12:38:59 yamt 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/malloc.h>
 @@ -1893,87 +1893,108 @@ wapbl_transaction_len(struct wapbl *wl)
 	    sizeof(((struct wapbl_wc_blocklist *)0)->wc_blocks[0]);
 	KASSERT(bph > 0);
 	len = wl->wl_bcount;
 	len += howmany(wl->wl_bufcount, bph) * blocklen;
 	len += howmany(wl->wl_dealloccnt, bph) * blocklen;
 	len += wapbl_transaction_inodes_len(wl);
 	return len;
+}
 /*
  * wapbl_cache_sync: issue DIOCCACHESYNC
  */
 static int
 wapbl_cache_sync(struct wapbl *wl, const char *msg)
+{
 	const bool verbose = wapbl_verbose_commit >= 2;
 	struct bintime start_time;
 	int force = 1;
 	int error;
 	if (!wapbl_flush_disk_cache) {
 		return 0;
+	}
 	if (verbose) {
 		bintime(&start_time);
+	}
 	error = VOP_IOCTL(wl->wl_devvp, DIOCCACHESYNC, &force,
 	    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));
+	}
 	if (verbose) {
 		struct bintime d;
 		struct timespec ts;
 		bintime(&d);
 		bintime_sub(&d, &start_time);
 		bintime2timespec(&d, &ts);
 		printf("wapbl_cache_sync: %s: dev 0x%jx %ju.%09lu\n",
 		    msg, (uintmax_t)wl->wl_devvp->v_rdev,
 		    (uintmax_t)ts.tv_sec, ts.tv_nsec);
+	}
 	return error;
+}
 /*
  * Perform commit operation
+ *
  * Note that generation number incrementation needs to
  * be protected against racing with other invocations
- * of wapbl_commit.  This is ok since this routine
+ * of wapbl_write_commit.  This is ok since this routine
  * is only invoked from wapbl_flush
  */
 static int
 wapbl_write_commit(struct wapbl *wl, off_t head, off_t tail)
+{
 	struct wapbl_wc_header *wc = wl->wl_wc_header;
 	struct timespec ts;
 	int error;
 	int force = 1;
 	daddr_t pbn;
-	if (wapbl_flush_disk_cache) {
+	/* XXX Calc checksum here, instead we do this for now */
-		/* XXX Calc checksum here, instead we do this for now */
+	wapbl_cache_sync(wl, "1");
 		error = VOP_IOCTL(wl->wl_devvp, DIOCCACHESYNC, &force,
 		    FWRITE, FSCRED);
 		if (error) {
 			WAPBL_PRINTF(WAPBL_PRINT_ERROR,
 			    ("wapbl_write_commit: DIOCCACHESYNC on dev 0x%x "
 			    "returned %d\n", wl->wl_devvp->v_rdev, error));
 	wc->wc_head = head;
 	wc->wc_tail = tail;
 	wc->wc_checksum = 0;
 	wc->wc_version = 1;
 	getnanotime(&ts);
 	wc->wc_time = ts.tv_sec;
 	wc->wc_timensec = ts.tv_nsec;
 	WAPBL_PRINTF(WAPBL_PRINT_WRITE,
 	    ("wapbl_write_commit: head = %"PRIdMAX "tail = %"PRIdMAX"\n",
 	    (intmax_t)head, (intmax_t)tail));
 	/*
 	 * XXX if generation will rollover, then first zero
 	 * over second commit header before trying to write both headers.
 	 */
 	pbn = wl->wl_logpbn + (wc->wc_generation % 2);
 #ifdef _KERNEL
 	pbn = btodb(pbn << wc->wc_log_dev_bshift);
 #endif
 	error = wapbl_write(wc, wc->wc_len, wl->wl_devvp, pbn);
 	if (error)
 		return error;
-	if (wapbl_flush_disk_cache) {
+	wapbl_cache_sync(wl, "2");
 		error = VOP_IOCTL(wl->wl_devvp, DIOCCACHESYNC, &force,
 		    FWRITE, FSCRED);
 		if (error) {
 			WAPBL_PRINTF(WAPBL_PRINT_ERROR,
 			    ("wapbl_write_commit: DIOCCACHESYNC on dev 0x%x "
 			    "returned %d\n", wl->wl_devvp->v_rdev, error));
 	/*
 	 * If the generation number was zero, write it out a second time.
 	 * This handles initialization and generation number rollover
 	 */
 	if (wc->wc_generation++ == 0) {
 		error = wapbl_write_commit(wl, head, tail);
 		/*
 		 * This panic should be able to be removed if we do the
 		 * zero'ing mentioned above, and we are certain to roll
 		 * back generation number on failure.
 		 */
 		if (error)