From ff261f16f69e92bb59bacb533369488ce28db1d6 Mon Sep 17 00:00:00 2001
From: Bruce Evans <bde@FreeBSD.org>
Date: Mon, 7 Sep 1998 11:50:19 +0000
Subject: [PATCH] Put the zombie ffs sysctl node in "notyet" state together
 with its few remaining children.  Prepare it for MOUNT_UFS going away.

---
 sys/ufs/ffs/ffs_alloc.c     | 4 +++-
 sys/ufs/ffs/ffs_vnops.c     | 5 +----
 sys/ufs/ufs/ufs_readwrite.c | 3 +--
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c
index e73638d1c106..bd127db179f1 100644
--- a/sys/ufs/ffs/ffs_alloc.c
+++ b/sys/ufs/ffs/ffs_alloc.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_alloc.c	8.18 (Berkeley) 5/26/95
- * $Id: ffs_alloc.c,v 1.51 1998/08/17 19:09:36 bde Exp $
+ * $Id: ffs_alloc.c,v 1.52 1998/09/05 14:13:12 phk Exp $
  */
 
 #include "opt_quota.h"
@@ -324,6 +324,8 @@ nospace:
 }
 
 #ifdef notyet
+SYSCTL_NODE(_vfs, OID_AUTO, ffs, CTLFLAG_RW, 0, "FFS filesystem");
+
 /*
  * Reallocate a sequence of blocks into a contiguous sequence of blocks.
  *
diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c
index 8160d04c7b2a..b2fe80f952e7 100644
--- a/sys/ufs/ffs/ffs_vnops.c
+++ b/sys/ufs/ffs/ffs_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_vnops.c	8.15 (Berkeley) 5/14/95
- * $Id: ffs_vnops.c,v 1.49 1998/05/11 21:41:13 julian Exp $
+ * $Id: ffs_vnops.c,v 1.50 1998/06/10 19:27:56 julian Exp $
  */
 
 #include <sys/param.h>
@@ -43,7 +43,6 @@
 #include <sys/buf.h>
 #include <sys/proc.h>
 #include <sys/mount.h>
-#include <sys/sysctl.h>
 #include <sys/vnode.h>
 
 #include <machine/limits.h>
@@ -106,8 +105,6 @@ VNODEOP_SET(ffs_vnodeop_opv_desc);
 VNODEOP_SET(ffs_specop_opv_desc);
 VNODEOP_SET(ffs_fifoop_opv_desc);
 
-SYSCTL_NODE(_vfs, MOUNT_UFS, ffs, CTLFLAG_RW, 0, "FFS filesystem");
-
 #include <ufs/ufs/ufs_readwrite.c>
 
 /*
diff --git a/sys/ufs/ufs/ufs_readwrite.c b/sys/ufs/ufs/ufs_readwrite.c
index b4d50e7b81f3..265ba661b37a 100644
--- a/sys/ufs/ufs/ufs_readwrite.c
+++ b/sys/ufs/ufs/ufs_readwrite.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_readwrite.c	8.11 (Berkeley) 5/8/95
- * $Id: ufs_readwrite.c,v 1.50 1998/06/04 17:04:44 dfr Exp $
+ * $Id: ufs_readwrite.c,v 1.51 1998/07/08 01:04:33 julian Exp $
  */
 
 #define	BLKSIZE(a, b, c)	blksize(a, b, c)
@@ -48,7 +48,6 @@
 #include <vm/vm_map.h>
 #include <vm/vnode_pager.h>
 #include <sys/poll.h>
-#include <sys/sysctl.h>
 
 /*
  * Vnode op for reading.