From e757e51d552221d5d5660b6939ee4190d1ab6d65 Mon Sep 17 00:00:00 2001
From: tegge <tegge@FreeBSD.org>
Date: Mon, 15 May 2006 22:52:22 +0000
Subject: Errors detected while file system is suspended should not trigger an
 assertion failure.

---
 sys/ufs/ffs/ffs_snapshot.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'sys/ufs/ffs')

diff --git a/sys/ufs/ffs/ffs_snapshot.c b/sys/ufs/ffs/ffs_snapshot.c
index c8dcdcd..2b5bf1c 100644
--- a/sys/ufs/ffs/ffs_snapshot.c
+++ b/sys/ufs/ffs/ffs_snapshot.c
@@ -215,10 +215,7 @@ ffs_snapshot(mp, snapfile)
 
 	ump = VFSTOUFS(mp);
 	fs = ump->um_fs;
-	/*
-	 * XXX: make sure we don't go to out1 before we setup sn
-	 */
-	sn = (void *)0xdeadbeef;
+	sn = NULL;
 
 	/*
 	 * Need to serialize access to snapshot code per filesystem.
@@ -422,7 +419,6 @@ restart:
 	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td);
 	if (ip->i_effnlink == 0) {
 		error = ENOENT;		/* Snapshot file unlinked */
-		sn = NULL;
 		goto out1;
 	}
 	if (collectsnapstats)
@@ -673,7 +669,9 @@ loop:
 	ASSERT_VOP_LOCKED(vp, "ffs_snapshot vp");
 	vp->v_vflag |= VV_SYSTEM;
 out1:
-	KASSERT(sn != (void *)0xdeadbeef, ("email phk@ and mckusick@"));
+	KASSERT((sn != NULL && sbp != NULL && error == 0) ||
+		(sn == NULL && sbp == NULL && error != 0),
+		("email phk@ and mckusick@"));
 	/*
 	 * Resume operation on filesystem.
 	 */
-- 
cgit v1.1