diff options
author | bde <bde@FreeBSD.org> | 1997-04-01 11:48:30 +0000 |
---|---|---|
committer | bde <bde@FreeBSD.org> | 1997-04-01 11:48:30 +0000 |
commit | 9605d751abf01265e00eda106bc602187f3e65a9 (patch) | |
tree | e8dd0aca9ac344c88502ca0714a6fe9d81d35cb6 /sys/kern | |
parent | 895862c7f07ae0584a722b20317396d6befc7ba3 (diff) | |
download | FreeBSD-src-9605d751abf01265e00eda106bc602187f3e65a9.zip FreeBSD-src-9605d751abf01265e00eda106bc602187f3e65a9.tar.gz |
Use OID_AUTO instead of magic number for the old sysctl debug.rcluster.
The magic number conflicted with the rotting disabled one in ext2fs for
debug.doasyncfree.
Removed messy debugging variable/constant/sysctl debug.doreallocblks.
Lite2 removed it, and we don't use the code that it controls.
Diffstat (limited to 'sys/kern')
-rw-r--r-- | sys/kern/vfs_cluster.c | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/sys/kern/vfs_cluster.c b/sys/kern/vfs_cluster.c index b00da1f..9c8b143 100644 --- a/sys/kern/vfs_cluster.c +++ b/sys/kern/vfs_cluster.c @@ -33,7 +33,7 @@ * SUCH DAMAGE. * * @(#)vfs_cluster.c 8.7 (Berkeley) 2/13/94 - * $Id: vfs_cluster.c,v 1.42 1997/02/22 09:39:31 peter Exp $ + * $Id: vfs_cluster.c,v 1.43 1997/03/07 14:40:54 dyson Exp $ */ #include <sys/param.h> @@ -56,22 +56,10 @@ #include <sys/sysctl.h> #include <sys/kernel.h> static int rcluster= 0; -SYSCTL_INT(_debug, 14, rcluster, CTLFLAG_RW, &rcluster, 0, ""); +SYSCTL_INT(_debug, OID_AUTO, rcluster, CTLFLAG_RW, &rcluster, 0, ""); #endif #ifdef notyet_block_reallocation_enabled -#ifdef DEBUG -#include <sys/sysctl.h> -#include <sys/kernel.h> - -static int doreallocblks = 0; -SYSCTL_INT(_debug, 13, doreallocblks, CTLFLAG_RW, &doreallocblks, 0, ""); -#else -#define doreallocblks 0 -#endif -#endif /* notyet_block_reallocation_enabled */ - -#ifdef notyet_block_reallocation_enabled static struct cluster_save * cluster_collectbufs __P((struct vnode *vp, struct buf *last_bp)); #endif @@ -538,8 +526,7 @@ cluster_write(bp, filesize) vp->v_cstart, cursize); } #else - if (!doreallocblks || - (lbn + 1) * lblocksize != filesize || + if ((lbn + 1) * lblocksize != filesize || lbn != vp->v_lastw + 1 || vp->v_clen <= cursize) { if (!async) cluster_wbuild(vp, lblocksize, |