[src/trunk]: src/sys add wo_wapbl_jlock_assert to wapbl_ops

[jdolecek <jdolecek%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/506f8e56656b
branches:  trunk
changeset: 446563:506f8e56656b
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Mon Dec 10 21:03:48 2018 +0000

description:
add wo_wapbl_jlock_assert to wapbl_ops

diffstat:

 sys/kern/vfs_wapbl.c |  5 +++--
 sys/sys/mount.h      |  5 ++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diffs (52 lines):

diff -r 5d29231a8239 -r 506f8e56656b sys/kern/vfs_wapbl.c
--- a/sys/kern/vfs_wapbl.c      Mon Dec 10 20:48:34 2018 +0000
+++ b/sys/kern/vfs_wapbl.c      Mon Dec 10 21:03:48 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vfs_wapbl.c,v 1.101 2017/12/02 17:29:55 jdolecek Exp $ */
+/*     $NetBSD: vfs_wapbl.c,v 1.102 2018/12/10 21:03:48 jdolecek Exp $ */
 
 /*-
  * Copyright (c) 2003, 2008, 2009 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
 #define WAPBL_INTERNAL
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_wapbl.c,v 1.101 2017/12/02 17:29:55 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_wapbl.c,v 1.102 2018/12/10 21:03:48 jdolecek Exp $");
 
 #include <sys/param.h>
 #include <sys/bitops.h>
@@ -312,6 +312,7 @@
        .wo_wapbl_begin         = wapbl_begin,
        .wo_wapbl_end           = wapbl_end,
        .wo_wapbl_junlock_assert= wapbl_junlock_assert,
+       .wo_wapbl_jlock_assert  = wapbl_jlock_assert,
 
        /* XXX: the following is only used to say "this is a wapbl buf" */
        .wo_wapbl_biodone       = wapbl_biodone,
diff -r 5d29231a8239 -r 506f8e56656b sys/sys/mount.h
--- a/sys/sys/mount.h   Mon Dec 10 20:48:34 2018 +0000
+++ b/sys/sys/mount.h   Mon Dec 10 21:03:48 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mount.h,v 1.231 2018/08/22 01:05:24 msaitoh Exp $      */
+/*     $NetBSD: mount.h,v 1.232 2018/12/10 21:03:48 jdolecek Exp $     */
 
 /*
  * Copyright (c) 1989, 1991, 1993
@@ -283,6 +283,7 @@
        int (*wo_wapbl_begin)(struct wapbl *, const char *, int);
        void (*wo_wapbl_end)(struct wapbl *);
        void (*wo_wapbl_junlock_assert)(struct wapbl *);
+       void (*wo_wapbl_jlock_assert)(struct wapbl *);
        void (*wo_wapbl_biodone)(struct buf *);
 };
 #define WAPBL_DISCARD(MP)                                              \
@@ -309,6 +310,8 @@
     (*(MP)->mnt_wapbl_op->wo_wapbl_end)((MP)->mnt_wapbl)
 #define WAPBL_JUNLOCK_ASSERT(MP)                                       \
     (*(MP)->mnt_wapbl_op->wo_wapbl_junlock_assert)((MP)->mnt_wapbl)
+#define WAPBL_JLOCK_ASSERT(MP)                                         \
+    (*(MP)->mnt_wapbl_op->wo_wapbl_jlock_assert)((MP)->mnt_wapbl)
 
 struct vfs_hooks {
        LIST_ENTRY(vfs_hooks) vfs_hooks_list;