Module Name: src Committed By: hannken Date: Mon May 18 08:28:44 UTC 2020
Modified Files: src/sys/ufs/ffs: ffs_vfsops.c src/sys/ufs/ufs: ufs_vnops.c Log Message: Assert ufs_strategy() always gets used while current thread holds a fstrans lock. To generate a diff of this commit: cvs rdiff -u -r1.369 -r1.370 src/sys/ufs/ffs/ffs_vfsops.c cvs rdiff -u -r1.254 -r1.255 src/sys/ufs/ufs/ufs_vnops.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.369 src/sys/ufs/ffs/ffs_vfsops.c:1.370 --- src/sys/ufs/ffs/ffs_vfsops.c:1.369 Sat May 16 18:31:53 2020 +++ src/sys/ufs/ffs/ffs_vfsops.c Mon May 18 08:28:44 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: ffs_vfsops.c,v 1.369 2020/05/16 18:31:53 christos Exp $ */ +/* $NetBSD: ffs_vfsops.c,v 1.370 2020/05/18 08:28:44 hannken 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.369 2020/05/16 18:31:53 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c,v 1.370 2020/05/18 08:28:44 hannken Exp $"); #if defined(_KERNEL_OPT) #include "opt_ffs.h" @@ -75,6 +75,7 @@ __KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c #include <sys/proc.h> #include <sys/kernel.h> #include <sys/vnode.h> +#include <sys/fstrans.h> #include <sys/socket.h> #include <sys/mount.h> #include <sys/buf.h> @@ -581,7 +582,12 @@ ffs_mount(struct mount *mp, const char * DPRINTF("VOP_OPEN returned %d", error); goto fail; } + /* Need fstrans_start() for assertion in ufs_strategy(). */ + if ((mp->mnt_flag & MNT_RDONLY) == 0) + fstrans_start(mp); error = ffs_mountfs(devvp, mp, l); + if ((mp->mnt_flag & MNT_RDONLY) == 0) + fstrans_done(mp); if (error) { DPRINTF("ffs_mountfs returned %d", error); vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY); Index: src/sys/ufs/ufs/ufs_vnops.c diff -u src/sys/ufs/ufs/ufs_vnops.c:1.254 src/sys/ufs/ufs/ufs_vnops.c:1.255 --- src/sys/ufs/ufs/ufs_vnops.c:1.254 Sat May 16 18:31:54 2020 +++ src/sys/ufs/ufs/ufs_vnops.c Mon May 18 08:28:44 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: ufs_vnops.c,v 1.254 2020/05/16 18:31:54 christos Exp $ */ +/* $NetBSD: ufs_vnops.c,v 1.255 2020/05/18 08:28:44 hannken Exp $ */ /*- * Copyright (c) 2008, 2020 The NetBSD Foundation, Inc. @@ -66,7 +66,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ufs_vnops.c,v 1.254 2020/05/16 18:31:54 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ufs_vnops.c,v 1.255 2020/05/18 08:28:44 hannken Exp $"); #if defined(_KERNEL_OPT) #include "opt_ffs.h" @@ -84,6 +84,7 @@ __KERNEL_RCSID(0, "$NetBSD: ufs_vnops.c, #include <sys/proc.h> #include <sys/mount.h> #include <sys/vnode.h> +#include <sys/fstrans.h> #include <sys/kmem.h> #include <sys/malloc.h> #include <sys/dirent.h> @@ -1869,6 +1870,7 @@ ufs_strategy(void *v) ip = VTOI(vp); if (vp->v_type == VBLK || vp->v_type == VCHR) panic("ufs_strategy: spec"); + KASSERT(fstrans_held(vp->v_mount)); KASSERT(bp->b_bcount != 0); if (bp->b_blkno == bp->b_lblkno) { error = VOP_BMAP(vp, bp->b_lblkno, NULL, &bp->b_blkno,