CVS commit: src/sys/ufs/ffs

[Christos Zoulas]

Module Name:    src
Committed By:   christos
Date:           Fri Jul 11 16:17:29 UTC 2014

Modified Files:
        src/sys/ufs/ffs: ffs_wapbl.c

Log Message:
move the flag setting higher to avoid KASSERT (dholland)


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/ufs/ffs/ffs_wapbl.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/ufs/ffs/ffs_wapbl.c
diff -u src/sys/ufs/ffs/ffs_wapbl.c:1.27 src/sys/ufs/ffs/ffs_wapbl.c:1.28
--- src/sys/ufs/ffs/ffs_wapbl.c:1.27	Thu Jul 10 11:15:54 2014
+++ src/sys/ufs/ffs/ffs_wapbl.c	Fri Jul 11 12:17:29 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: ffs_wapbl.c,v 1.27 2014/07/10 15:15:54 christos Exp $	*/
+/*	$NetBSD: ffs_wapbl.c,v 1.28 2014/07/11 16:17:29 christos Exp $	*/
 
 /*-
  * Copyright (c) 2003,2006,2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ffs_wapbl.c,v 1.27 2014/07/10 15:15:54 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_wapbl.c,v 1.28 2014/07/11 16:17:29 christos Exp $");
 
 #define WAPBL_INTERNAL
 
@@ -351,9 +351,9 @@ ffs_wapbl_start(struct mount *mp)
 #endif
 
 			if ((fs->fs_flags & FS_DOWAPBL) == 0) {
+				fs->fs_flags |= FS_DOWAPBL;
 				if ((error = UFS_WAPBL_BEGIN(mp)) != 0)
 					goto out;
-				fs->fs_flags |= FS_DOWAPBL;
 				error = ffs_sbupdate(ump, MNT_WAIT);
 				if (error) {
 					UFS_WAPBL_END(mp);