Module Name: src
Committed By: jdolecek
Date: Mon Dec 10 21:03:49 UTC 2018
Modified Files:
src/sys/kern: vfs_wapbl.c
src/sys/sys: mount.h
Log Message:
add wo_wapbl_jlock_assert to wapbl_ops
To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.102 src/sys/kern/vfs_wapbl.c
cvs rdiff -u -r1.231 -r1.232 src/sys/sys/mount.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/vfs_wapbl.c
diff -u src/sys/kern/vfs_wapbl.c:1.101 src/sys/kern/vfs_wapbl.c:1.102
--- src/sys/kern/vfs_wapbl.c:1.101 Sat Dec 2 17:29:55 2017
+++ src/sys/kern/vfs_wapbl.c Mon Dec 10 21:03:48 2018
@@ -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 @@ struct wapbl_ops wapbl_ops = {
.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,
Index: src/sys/sys/mount.h
diff -u src/sys/sys/mount.h:1.231 src/sys/sys/mount.h:1.232
--- src/sys/sys/mount.h:1.231 Wed Aug 22 01:05:24 2018
+++ src/sys/sys/mount.h Mon Dec 10 21:03:48 2018
@@ -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 @@ struct wapbl_ops {
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 @@ struct wapbl_ops {
(*(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;
