 @@ -1,14 +1,14 @@
-/*	$NetBSD: ffs_vfsops.c,v 1.235 2008/09/21 21:08:22 freza Exp $	*/
+/*	$NetBSD: ffs_vfsops.c,v 1.236 2008/09/21 23:22:00 freza Exp $	*/
 /*-
  * Copyright (c) 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.
 @@ -51,27 +51,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 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.
+ *
  *	@(#)ffs_vfsops.c	8.31 (Berkeley) 5/20/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c,v 1.235 2008/09/21 21:08:22 freza Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c,v 1.236 2008/09/21 23:22:00 freza Exp $");
 #if defined(_KERNEL_OPT)
 #include "opt_ffs.h"
 #include "opt_quota.h"
 #include "opt_softdep.h"
 #include "opt_wapbl.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/namei.h>
 #include <sys/proc.h>
 #include <sys/kernel.h>
 @@ -580,27 +580,27 @@ ffs_mount(struct mount *mp, const char *
 			 */
 			fs->fs_ronly = 0;
 			fs->fs_clean <<= 1;
 			fs->fs_fmod = 1;
 			if ((fs->fs_flags & FS_DOSOFTDEP)) {
 				error = softdep_mount(devvp, mp, fs,
 				    l->l_cred);
 				if (error)
 					return (error);
+			}
 #ifdef WAPBL
 			if (fs->fs_flags & FS_DOWAPBL) {
 				printf("%s: replaying log to disk\n",
-				    path);
+				    fs->fs_fsmnt);
 				KDASSERT(mp->mnt_wapbl_replay);
 				error = wapbl_replay_write(mp->mnt_wapbl_replay,
 							   devvp);
 				if (error) {
 					return error;
+				}
 				wapbl_replay_stop(mp->mnt_wapbl_replay);
 				fs->fs_clean = FS_WASCLEAN;
+			}
 #endif /* WAPBL */
 			if (fs->fs_snapinum[0] != 0)
 				ffs_snapshot_mount(mp);
+		}
 @@ -1052,36 +1052,36 @@ ffs_mountfs(struct vnode *devvp, struct
 		ffs_sb_swap((struct fs*)bp->b_data, fs);
 		fs->fs_flags |= FS_SWAPPED;
 	} else
 #endif
 		fs->fs_flags &= ~FS_SWAPPED;
 #ifdef WAPBL
 	if ((mp->mnt_wapbl_replay == 0) && (fs->fs_flags & FS_DOWAPBL)) {
 		error = ffs_wapbl_replay_start(mp, fs, devvp);
 		if (error)
 			goto out;
 		if (!ronly) {
-			printf("%s: replaying log to disk\n",
+			/* XXX fsmnt may be stale. */
-			    mp->mnt_stat.f_mntonname);
+			printf("%s: replaying log to disk\n", fs->fs_fsmnt);
 			error = wapbl_replay_write(mp->mnt_wapbl_replay, devvp);
 			if (error)
 				goto out;
 			wapbl_replay_stop(mp->mnt_wapbl_replay);
 			fs->fs_clean = FS_WASCLEAN;
 		} else {
-			printf("%s: replaying log to memory\n",
+			/* XXX fsmnt may be stale */
-			    mp->mnt_stat.f_mntonname);
+			printf("%s: replaying log to memory\n", fs->fs_fsmnt);
+		}
 		/* Force a re-read of the superblock */
 		brelse(bp, BC_INVAL);
 		bp = NULL;
 		free(fs, M_UFSMNT);
 		fs = NULL;
 		goto sbagain;
+	}
 #else /* !WAPBL */
 	if ((fs->fs_flags & FS_DOWAPBL) && (mp->mnt_flag & MNT_FORCE) == 0) {
 		error = EPERM;
 		goto out;