 @@ -1,14 +1,14 @@
-/*	$NetBSD: ffs_snapshot.c,v 1.72 2008/07/30 10:09:30 hannken Exp $	*/
+/*	$NetBSD: ffs_snapshot.c,v 1.73 2008/07/31 15:37:56 hannken Exp $	*/
 /*
  * Copyright 2000 Marshall Kirk McKusick. All Rights Reserved.
+ *
  * Further information about snapshots can be obtained from:
+ *
  *	Marshall Kirk McKusick		http://www.mckusick.com/softdep/
  *	1614 Oxford Street		mckusick@mckusick.com
  *	Berkeley, CA 94709-1608		+1-510-843-9542
  *	USA
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
 @@ -28,27 +28,27 @@
  * 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_snapshot.c	8.11 (McKusick) 7/23/00
+ *
  *	from FreeBSD: ffs_snapshot.c,v 1.79 2004/02/13 02:02:06 kuriyama Exp
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ffs_snapshot.c,v 1.72 2008/07/30 10:09:30 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_snapshot.c,v 1.73 2008/07/31 15:37:56 hannken Exp $");
 #if defined(_KERNEL_OPT)
 #include "opt_ffs.h"
 #endif
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
 #include <sys/buf.h>
 #include <sys/proc.h>
 #include <sys/namei.h>
 #include <sys/sched.h>
 @@ -197,26 +197,29 @@ ffs_snapshot(struct mount *mp, struct vn
 	void *space;
 	void *sbbuf = NULL;
 	struct fs *copy_fs = NULL, *fs = VFSTOUFS(mp)->um_fs;
 	struct lwp *l = curlwp;
 	struct inode *ip, *xp;
 	struct buf *bp, *ibp, *nbp;
 	struct vattr vat;
 	struct vnode *xvp, *mvp, *devvp;
 	struct snap_info *si;
 	ns = UFS_FSNEEDSWAP(fs);
 	si = VFSTOUFS(mp)->um_snapinfo;
 	/* Snapshots do not work yet with WAPBL. */
 	if ((mp->mnt_flag & MNT_LOG))
 		return EOPNOTSUPP;
 	/*
 	 * Need to serialize access to snapshot code per filesystem.
 	 */
 	/*
 	 * If the vnode already is a snapshot, return.
 	 */
 	if (VTOI(vp)->i_flags & SF_SNAPSHOT) {
 		if (ctime) {
 			ctime->tv_sec = DIP(VTOI(vp), mtime);
 			ctime->tv_nsec = DIP(VTOI(vp), mtimensec);
+		}
 		return 0;
+	}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ffs_vfsops.c,v 1.231 2008/07/31 05:38:06 simonb Exp $	*/
+/*	$NetBSD: ffs_vfsops.c,v 1.232 2008/07/31 15:37:56 hannken 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.231 2008/07/31 05:38:06 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c,v 1.232 2008/07/31 15:37:56 hannken 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>
 @@ -1281,46 +1281,53 @@ ffs_mountfs(struct vnode *devvp, struct
 	ump->um_lognindir = ffs(fs->fs_nindir) - 1;
 	ump->um_bptrtodb = fs->fs_fsbtodb;
 	ump->um_seqinc = fs->fs_frag;
 	for (i = 0; i < MAXQUOTAS; i++)
 		ump->um_quotas[i] = NULLVP;
 	devvp->v_specmountpoint = mp;
 	if (ronly == 0 && (fs->fs_flags & FS_DOSOFTDEP)) {
 		error = softdep_mount(devvp, mp, fs, cred);
 		if (error) {
 			free(fs->fs_csp, M_UFSMNT);
 			goto out;
+		}
+	}
 	/* Snapshots do not work yet with WAPBL. */
 	if (ronly == 0 && fs->fs_snapinum[0] != 0 && (mp->mnt_flag & MNT_LOG)) {
 		printf("%s fs has snapshots -- logging not supported yet\n",
 		    fs->fs_fsmnt);
 		error = EINVAL;
 		free(fs->fs_csp, M_UFSMNT);
 		goto out;
+	}
 	if (ronly == 0 && fs->fs_snapinum[0] != 0)
 		ffs_snapshot_mount(mp);
 #ifdef WAPBL
 	if (!ronly) {
 		KDASSERT(fs->fs_ronly == 0);
 		/*
 		 * ffs_wapbl_start() needs mp->mnt_stat initialised if it
 		 * needs to create a new log file in-filesystem.
 		 */
 		ffs_statvfs(mp, &mp->mnt_stat);
 		error = ffs_wapbl_start(mp);
 		if (error) {
 			free(fs->fs_csp, M_UFSMNT);
 			goto out;
+		}
+	}
 #endif /* WAPBL */
 	if (ronly == 0 && fs->fs_snapinum[0] != 0)
 		ffs_snapshot_mount(mp);
 #ifdef UFS_EXTATTR
 	/*
 	 * Initialize file-backed extended attributes on UFS1 file
 	 * systems.
 	 */
 	if (ump->um_fstype == UFS1) {
 		ufs_extattr_uepm_init(&ump->um_extattr);
 #ifdef UFS_EXTATTR_AUTOSTART
 		/*
 		 * XXX Just ignore errors.  Not clear that we should
 		 * XXX fail the mount in this case.
 		 */
 		(void) ufs_extattr_autostart(mp, l);