Module Name: src
Committed By: hannken
Date: Sat Mar 19 13:48:42 UTC 2022
Modified Files:
src/sys/ufs/mfs: mfs_vfsops.c mfs_vnops.c
Log Message:
Switch MFS device node to real vnode locking, VV_LOCKSWORK now.
To generate a diff of this commit:
cvs rdiff -u -r1.114 -r1.115 src/sys/ufs/mfs/mfs_vfsops.c
cvs rdiff -u -r1.63 -r1.64 src/sys/ufs/mfs/mfs_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/mfs/mfs_vfsops.c
diff -u src/sys/ufs/mfs/mfs_vfsops.c:1.114 src/sys/ufs/mfs/mfs_vfsops.c:1.115
--- src/sys/ufs/mfs/mfs_vfsops.c:1.114 Mon Mar 16 21:20:13 2020
+++ src/sys/ufs/mfs/mfs_vfsops.c Sat Mar 19 13:48:42 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: mfs_vfsops.c,v 1.114 2020/03/16 21:20:13 pgoyette Exp $ */
+/* $NetBSD: mfs_vfsops.c,v 1.115 2022/03/19 13:48:42 hannken Exp $ */
/*
* Copyright (c) 1989, 1990, 1993, 1994
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mfs_vfsops.c,v 1.114 2020/03/16 21:20:13 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mfs_vfsops.c,v 1.115 2022/03/19 13:48:42 hannken Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -208,6 +208,7 @@ mfs_mountroot(void)
rootvp->v_data = mfsp;
rootvp->v_op = mfs_vnodeop_p;
rootvp->v_tag = VT_MFS;
+ rootvp->v_vflag |= VV_LOCKSWORK;
mfsp->mfs_baseoff = mfs_rootbase;
mfsp->mfs_size = mfs_rootsize;
mfsp->mfs_vnode = rootvp;
@@ -326,6 +327,7 @@ mfs_mount(struct mount *mp, const char *
KASSERT(devvp->v_data == NULL);
devvp->v_op = mfs_vnodeop_p;
devvp->v_data = mfsp;
+ devvp->v_vflag |= VV_LOCKSWORK;
mfsp->mfs_baseoff = args->base;
mfsp->mfs_size = args->size;
mfsp->mfs_vnode = devvp;
Index: src/sys/ufs/mfs/mfs_vnops.c
diff -u src/sys/ufs/mfs/mfs_vnops.c:1.63 src/sys/ufs/mfs/mfs_vnops.c:1.64
--- src/sys/ufs/mfs/mfs_vnops.c:1.63 Sun Jul 18 23:57:15 2021
+++ src/sys/ufs/mfs/mfs_vnops.c Sat Mar 19 13:48:42 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: mfs_vnops.c,v 1.63 2021/07/18 23:57:15 dholland Exp $ */
+/* $NetBSD: mfs_vnops.c,v 1.64 2022/03/19 13:48:42 hannken Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mfs_vnops.c,v 1.63 2021/07/18 23:57:15 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mfs_vnops.c,v 1.64 2022/03/19 13:48:42 hannken Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -89,12 +89,12 @@ const struct vnodeopv_entry_desc mfs_vno
{ &vop_abortop_desc, genfs_badop }, /* abortop */
{ &vop_inactive_desc, mfs_inactive }, /* inactive */
{ &vop_reclaim_desc, mfs_reclaim }, /* reclaim */
- { &vop_lock_desc, genfs_nolock }, /* lock */
- { &vop_unlock_desc, genfs_nounlock }, /* unlock */
+ { &vop_lock_desc, genfs_lock }, /* lock */
+ { &vop_unlock_desc, genfs_unlock }, /* unlock */
{ &vop_bmap_desc, mfs_bmap }, /* bmap */
{ &vop_strategy_desc, mfs_strategy }, /* strategy */
{ &vop_print_desc, mfs_print }, /* print */
- { &vop_islocked_desc, genfs_noislocked }, /* islocked */
+ { &vop_islocked_desc, genfs_islocked }, /* islocked */
{ &vop_pathconf_desc, genfs_badop }, /* pathconf */
{ &vop_advlock_desc, genfs_badop }, /* advlock */
{ &vop_bwrite_desc, vn_bwrite }, /* bwrite */
