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

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/ufs/ffs/ffs_vfsops.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/ufs/ffs/ffs_vfsops.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.356.2.4
retrieving revision 1.357
diff -u -p -r1.356.2.4 -r1.357
--- src/sys/ufs/ffs/ffs_vfsops.c	2019/01/18 08:50:59	1.356.2.4
+++ src/sys/ufs/ffs/ffs_vfsops.c	2018/05/28 21:04:38	1.357
@@ -1,4 +1,4 @@
-/*	$NetBSD: ffs_vfsops.c,v 1.356.2.4 2019/01/18 08:50:59 pgoyette Exp $	*/
+/*	$NetBSD: ffs_vfsops.c,v 1.357 2018/05/28 21:04:38 chs 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.356.2.4 2019/01/18 08:50:59 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c,v 1.357 2018/05/28 21:04:38 chs Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_ffs.h"
@@ -80,6 +80,7 @@ __KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c
 #include <sys/buf.h>
 #include <sys/device.h>
 #include <sys/disk.h>
+#include <sys/mbuf.h>
 #include <sys/file.h>
 #include <sys/disklabel.h>
 #include <sys/ioctl.h>
@@ -970,7 +971,7 @@ ffs_superblock_validate(struct fs *fs)
 	 * XXX: these values are just zero-checked to prevent obvious
 	 * bugs. We need more strict checks.
 	 */
-	if (fs->fs_size == 0 && fs->fs_old_size == 0)
+	if (fs->fs_size == 0)
 		return 0;
 	if (fs->fs_cssize == 0)
 		return 0;
@@ -2091,7 +2092,7 @@ ffs_loadvnode(struct mount *mp, struct v
  */
 int
 ffs_newvnode(struct mount *mp, struct vnode *dvp, struct vnode *vp,
-    struct vattr *vap, kauth_cred_t cred, void *extra,
+    struct vattr *vap, kauth_cred_t cred,
     size_t *key_len, const void **new_key)
 {
 	ino_t ino;
@@ -2334,7 +2335,7 @@ ffs_cgupdate(struct ufsmount *mp, int wa
 	void *space;
 	int i, size, error = 0, allerror = 0;
 
-	UFS_WAPBL_JLOCK_ASSERT(mp->um_mountp);
+	UFS_WAPBL_JLOCK_ASSERT(mp);
 
 	allerror = ffs_sbupdate(mp, waitfor);
 	blks = howmany(fs->fs_cssize, fs->fs_fsize);