Module Name: src
Committed By: pooka
Date: Sat Apr 18 15:40:34 UTC 2009
Modified Files:
src/sys/miscfs/genfs: genfs_io.c genfs_vnops.c
src/sys/rump/librump/rumpvfs: genfs_io.c
Log Message:
Move genfs_null_putpages() from genfs_io.c to genfs_vnops.c -- it does
not really do i/o.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/miscfs/genfs/genfs_io.c
cvs rdiff -u -r1.167 -r1.168 src/sys/miscfs/genfs/genfs_vnops.c
cvs rdiff -u -r1.11 -r1.12 src/sys/rump/librump/rumpvfs/genfs_io.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/miscfs/genfs/genfs_io.c
diff -u src/sys/miscfs/genfs/genfs_io.c:1.19 src/sys/miscfs/genfs/genfs_io.c:1.20
--- src/sys/miscfs/genfs/genfs_io.c:1.19 Mon Feb 23 21:27:51 2009
+++ src/sys/miscfs/genfs/genfs_io.c Sat Apr 18 15:40:33 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: genfs_io.c,v 1.19 2009/02/23 21:27:51 rmind Exp $ */
+/* $NetBSD: genfs_io.c,v 1.20 2009/04/18 15:40:33 pooka Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: genfs_io.c,v 1.19 2009/02/23 21:27:51 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfs_io.c,v 1.20 2009/04/18 15:40:33 pooka Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1391,26 +1391,6 @@
return (error);
}
-/*
- * VOP_PUTPAGES() for vnodes which never have pages.
- */
-
-int
-genfs_null_putpages(void *v)
-{
- struct vop_putpages_args /* {
- struct vnode *a_vp;
- voff_t a_offlo;
- voff_t a_offhi;
- int a_flags;
- } */ *ap = v;
- struct vnode *vp = ap->a_vp;
-
- KASSERT(vp->v_uobj.uo_npages == 0);
- mutex_exit(&vp->v_interlock);
- return (0);
-}
-
int
genfs_compat_getpages(void *v)
{
Index: src/sys/miscfs/genfs/genfs_vnops.c
diff -u src/sys/miscfs/genfs/genfs_vnops.c:1.167 src/sys/miscfs/genfs/genfs_vnops.c:1.168
--- src/sys/miscfs/genfs/genfs_vnops.c:1.167 Mon Apr 28 20:24:08 2008
+++ src/sys/miscfs/genfs/genfs_vnops.c Sat Apr 18 15:40:33 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: genfs_vnops.c,v 1.167 2008/04/28 20:24:08 martin Exp $ */
+/* $NetBSD: genfs_vnops.c,v 1.168 2009/04/18 15:40:33 pooka Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: genfs_vnops.c,v 1.167 2008/04/28 20:24:08 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfs_vnops.c,v 1.168 2009/04/18 15:40:33 pooka Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -347,6 +347,26 @@
return (0);
}
+/*
+ * VOP_PUTPAGES() for vnodes which never have pages.
+ */
+
+int
+genfs_null_putpages(void *v)
+{
+ struct vop_putpages_args /* {
+ struct vnode *a_vp;
+ voff_t a_offlo;
+ voff_t a_offhi;
+ int a_flags;
+ } */ *ap = v;
+ struct vnode *vp = ap->a_vp;
+
+ KASSERT(vp->v_uobj.uo_npages == 0);
+ mutex_exit(&vp->v_interlock);
+ return (0);
+}
+
void
genfs_node_init(struct vnode *vp, const struct genfs_ops *ops)
{
Index: src/sys/rump/librump/rumpvfs/genfs_io.c
diff -u src/sys/rump/librump/rumpvfs/genfs_io.c:1.11 src/sys/rump/librump/rumpvfs/genfs_io.c:1.12
--- src/sys/rump/librump/rumpvfs/genfs_io.c:1.11 Mon Apr 6 20:41:29 2009
+++ src/sys/rump/librump/rumpvfs/genfs_io.c Sat Apr 18 15:40:33 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: genfs_io.c,v 1.11 2009/04/06 20:41:29 pooka Exp $ */
+/* $NetBSD: genfs_io.c,v 1.12 2009/04/18 15:40:33 pooka Exp $ */
/*
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: genfs_io.c,v 1.11 2009/04/06 20:41:29 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfs_io.c,v 1.12 2009/04/18 15:40:33 pooka Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -453,17 +453,6 @@
}
int
-genfs_null_putpages(void *v)
-{
- struct vop_putpages_args *ap = v;
- struct vnode *vp = ap->a_vp;
-
- KASSERT(vp->v_uobj.uo_npages == 0);
- mutex_exit(&vp->v_interlock);
- return 0;
-}
-
-int
genfs_compat_gop_write(struct vnode *vp, struct vm_page **pgs,
int npages, int flags)
{
