 @@ -1,14 +1,14 @@
-/*	$NetBSD: ffs_snapshot.c,v 1.113 2011/04/23 08:23:52 hannken Exp $	*/
+/*	$NetBSD: ffs_snapshot.c,v 1.114 2011/04/29 09:45:15 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.113 2011/04/23 08:23:52 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_snapshot.c,v 1.114 2011/04/29 09:45:15 hannken Exp $");
 #if defined(_KERNEL_OPT)
 #include "opt_ffs.h"
 #include "opt_quota.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>
 @@ -167,27 +167,27 @@ ffs_snapshot_fini(struct ufsmount *ump)
+}
 /*
  * Create a snapshot file and initialize it for the filesystem.
  * Vnode is locked on entry and return.
  */
 int
 ffs_snapshot(struct mount *mp, struct vnode *vp, struct timespec *ctime)
+{
 #if defined(FFS_NO_SNAPSHOT)
 	return EOPNOTSUPP;
+}
 #else /* defined(FFS_NO_SNAPSHOT) */
-	bool suspended = false;
+	bool suspended = false, snapshot_locked = false;
 	int error, redo = 0, snaploc;
 	void *sbbuf = NULL;
 	daddr_t *snaplist = NULL, snaplistsize = 0;
 	struct buf *bp, *nbp;
 	struct fs *copy_fs = NULL;
 	struct fs *fs = VFSTOUFS(mp)->um_fs;
 	struct inode *ip = VTOI(vp);
 	struct lwp *l = curlwp;
 	struct snap_info *si = VFSTOUFS(mp)->um_snapinfo;
 	struct timespec ts;
 	struct timeval starttime;
 #ifdef DEBUG
 	struct timeval endtime;
 @@ -300,26 +300,44 @@ ffs_snapshot(struct mount *mp, struct vn
 	mutex_exit(&si->si_lock);
 	vp->v_vflag |= VV_SYSTEM;
 	/*
 	 * Set the mtime to the time the snapshot has been taken.
 	 */
 	TIMEVAL_TO_TIMESPEC(&starttime, &ts);
 	if (ctime)
 		*ctime = ts;
 	DIP_ASSIGN(ip, mtime, ts.tv_sec);
 	DIP_ASSIGN(ip, mtimensec, ts.tv_nsec);
 	ip->i_flag |= IN_CHANGE | IN_UPDATE;
 	/*
 	 * Lock the snapshot and resume file system.
 	 */
 	mutex_enter(&si->si_snaplock);
 	mutex_enter(&si->si_lock);
 	si->si_owner = curlwp;
 	mutex_exit(&si->si_lock);
 	snapshot_locked = true;
 	KASSERT(suspended);
 	vfs_resume(vp->v_mount);
 	suspended = false;
 #ifdef DEBUG
 	getmicrotime(&endtime);
 	timersub(&endtime, &starttime, &endtime);
 	printf("%s: suspended %lld.%03d sec, redo %d of %d\n",
 	    mp->mnt_stat.f_mntonname, (long long)endtime.tv_sec,
 	    endtime.tv_usec / 1000, redo, fs->fs_ncg);
 #endif
 	/*
 	 * Copy allocation information from all snapshots and then
 	 * expunge them from our view.
 	 */
 	error = snapshot_expunge_snap(mp, vp, copy_fs, snaplistsize);
 	if (error)
 		goto out;
 	/*
 	 * Write the superblock and its summary information to the snapshot.
 	 */
 	error = snapshot_writefs(mp, vp, sbbuf);
 	if (error)
 		goto out;
 	/*
 @@ -371,35 +389,33 @@ out:
+	}
 	if (error) {
 		fs->fs_snapinum[snaploc] = 0;
 	} else {
 		/*
 		 * As this is the newest list, it is the most inclusive, so
 		 * should replace the previous list.
 		 */
 		si->si_snapblklist = ip->i_snapblklist;
+	}
 	si->si_gen++;
 	mutex_exit(&si->si_lock);
-	if (suspended) {
+	if (suspended)
 		vfs_resume(vp->v_mount);
-#ifdef DEBUG
+	if (snapshot_locked) {
-		getmicrotime(&endtime);
+		mutex_enter(&si->si_lock);
-		timersub(&endtime, &starttime, &endtime);
+		si->si_owner = NULL;
-		printf("%s: suspended %lld.%03d sec, redo %d of %d\n",
+		mutex_exit(&si->si_lock);
-		    mp->mnt_stat.f_mntonname, (long long)endtime.tv_sec,
+		mutex_exit(&si->si_snaplock);
 		    endtime.tv_usec / 1000, redo, fs->fs_ncg);
 #endif
+	}
 	if (error) {
 		if (!UFS_WAPBL_BEGIN(mp)) {
 			(void) ffs_truncate(vp, (off_t)0, 0, NOCRED);
 			UFS_WAPBL_END(mp);
+		}
 	} else if (ip->i_nlink > 0)
 		vref(vp);
 	return (error);
+}
 /*
  * Prepare vnode to become a snapshot.