summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThordur I. Bjornsson <thib@cvs.openbsd.org>2007-04-13 17:09:23 +0000
committerThordur I. Bjornsson <thib@cvs.openbsd.org>2007-04-13 17:09:23 +0000
commit79085713a6f692f0c60863d240b2352b0df4c22b (patch)
tree7a865c0cbda930d4ae7bd634be27a7fcd84d08a8
parent749de29aa389aea8bf4dc738045291f1339a26ba (diff)
Move the declaration of VN_KNOTE() into vnode.h instead of having
multiple defines all over; ok tedu@
-rw-r--r--sys/kern/vfs_subr.c5
-rw-r--r--sys/nfs/nfs_var.h5
-rw-r--r--sys/sys/vnode.h4
-rw-r--r--sys/ufs/ffs/ffs_vnops.c5
-rw-r--r--sys/ufs/ufs/ufs_vnops.c5
5 files changed, 7 insertions, 17 deletions
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index a7dc77ba8e7..764a3f91ff0 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vfs_subr.c,v 1.143 2007/04/13 10:44:07 bluhm Exp $ */
+/* $OpenBSD: vfs_subr.c,v 1.144 2007/04/13 17:09:22 thib Exp $ */
/* $NetBSD: vfs_subr.c,v 1.53 1996/04/22 01:39:13 christos Exp $ */
/*
@@ -114,9 +114,6 @@ int vflush_vnode(struct vnode *, void *);
void printlockedvnodes(void);
#endif
-#define VN_KNOTE(vp, b) \
- KNOTE((struct klist *)&vp->v_selectinfo.vsi_selinfo.si_note, (b))
-
struct pool vnode_pool;
int desiredvnodes;
diff --git a/sys/nfs/nfs_var.h b/sys/nfs/nfs_var.h
index c4667fd8d45..5e2e85b3d49 100644
--- a/sys/nfs/nfs_var.h
+++ b/sys/nfs/nfs_var.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: nfs_var.h,v 1.24 2007/04/11 12:18:54 thib Exp $ */
+/* $OpenBSD: nfs_var.h,v 1.25 2007/04/13 17:09:22 thib Exp $ */
/* $NetBSD: nfs_var.h,v 1.3 1996/02/18 11:53:54 fvdl Exp $ */
/*
@@ -285,9 +285,6 @@ int nfs_savenickauth(struct nfsmount *, struct ucred *, int, NFSKERBKEY_T,
struct mbuf **, char **, struct mbuf *);
/* nfs_kq.c */
-
int nfs_kqfilter(void *);
void nfs_kqinit(void);
-#define VN_KNOTE(vp, b) \
- KNOTE(&vp->v_selectinfo.vsi_selinfo.si_note, (b))
diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h
index 63dbbb87f97..25e68ce52f6 100644
--- a/sys/sys/vnode.h
+++ b/sys/sys/vnode.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: vnode.h,v 1.76 2007/04/11 16:08:50 thib Exp $ */
+/* $OpenBSD: vnode.h,v 1.77 2007/04/13 17:09:22 thib Exp $ */
/* $NetBSD: vnode.h,v 1.38 1996/02/29 20:59:05 cgd Exp $ */
/*
@@ -251,6 +251,8 @@ vref(vp)
#endif /* DIAGNOSTIC */
#define NULLVP ((struct vnode *)NULL)
+#define VN_KNOTE(vp, b) \
+ KNOTE(&vp->v_selectinfo.vsi_selinfo.si_note, (b))
/*
* Global vnode data.
diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c
index 248ad3754ca..7cb8ca1f6a7 100644
--- a/sys/ufs/ffs/ffs_vnops.c
+++ b/sys/ufs/ffs/ffs_vnops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ffs_vnops.c,v 1.42 2007/02/26 11:25:23 pedro Exp $ */
+/* $OpenBSD: ffs_vnops.c,v 1.43 2007/04/13 17:09:22 thib Exp $ */
/* $NetBSD: ffs_vnops.c,v 1.7 1996/05/11 18:27:24 mycroft Exp $ */
/*
@@ -161,9 +161,6 @@ struct vnodeopv_desc ffs_fifoop_opv_desc =
int doclusterread = 1;
int doclusterwrite = 1;
-#define VN_KNOTE(vp, b) \
- KNOTE((struct klist *)&vp->v_selectinfo.vsi_selinfo.si_note, (b))
-
/*
* Vnode op for reading.
*/
diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c
index e3863cb60ec..d2586466346 100644
--- a/sys/ufs/ufs/ufs_vnops.c
+++ b/sys/ufs/ufs/ufs_vnops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ufs_vnops.c,v 1.77 2007/04/10 17:47:56 miod Exp $ */
+/* $OpenBSD: ufs_vnops.c,v 1.78 2007/04/13 17:09:22 thib Exp $ */
/* $NetBSD: ufs_vnops.c,v 1.18 1996/05/11 18:28:04 mycroft Exp $ */
/*
@@ -95,9 +95,6 @@ union _qcvt {
tmp.val[_QUAD_LOWWORD] = (l); \
(q) = tmp.qcvt; \
}
-#define VN_KNOTE(vp, b) \
- KNOTE(&vp->v_selectinfo.vsi_selinfo.si_note, (b))
-
/*
* A virgin directory (no blushing please).