Module Name: src
Committed By: jdolecek
Date: Thu Oct 20 19:31:32 UTC 2016
Modified Files:
src/sys/ufs/ffs: ffs_vfsops.c
Log Message:
add assertion to ensure ffs_cgupdate() is always called from
within a WAPBL transaction (if logging is on)
To generate a diff of this commit:
cvs rdiff -u -r1.340 -r1.341 src/sys/ufs/ffs/ffs_vfsops.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_vfsops.c
diff -u src/sys/ufs/ffs/ffs_vfsops.c:1.340 src/sys/ufs/ffs/ffs_vfsops.c:1.341
--- src/sys/ufs/ffs/ffs_vfsops.c:1.340 Thu Jul 28 08:24:58 2016
+++ src/sys/ufs/ffs/ffs_vfsops.c Thu Oct 20 19:31:32 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs_vfsops.c,v 1.340 2016/07/28 08:24:58 martin Exp $ */
+/* $NetBSD: ffs_vfsops.c,v 1.341 2016/10/20 19:31:32 jdolecek Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c,v 1.340 2016/07/28 08:24:58 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c,v 1.341 2016/10/20 19:31:32 jdolecek Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ffs.h"
@@ -2351,6 +2351,8 @@ ffs_cgupdate(struct ufsmount *mp, int wa
void *space;
int i, size, error = 0, allerror = 0;
+ UFS_WAPBL_JLOCK_ASSERT(mp);
+
allerror = ffs_sbupdate(mp, waitfor);
blks = howmany(fs->fs_cssize, fs->fs_fsize);
space = fs->fs_csp;
