summaryrefslogtreecommitdiffstats
path: root/sys/gnu
diff options
context:
space:
mode:
authorbde <bde@FreeBSD.org>1998-02-13 00:28:40 +0000
committerbde <bde@FreeBSD.org>1998-02-13 00:28:40 +0000
commitb28763a6b13c1f0830c84238266c8ad69f7455bd (patch)
tree547d37e7f1f3e10a38e4117c5d6267d49c0d6a88 /sys/gnu
parent227f4a2d7c1f29ccf25cad55e7fbff1ddc237099 (diff)
downloadFreeBSD-src-b28763a6b13c1f0830c84238266c8ad69f7455bd.zip
FreeBSD-src-b28763a6b13c1f0830c84238266c8ad69f7455bd.tar.gz
Fixed configuration and linkage of ext2_checkoverlap().
Diffstat (limited to 'sys/gnu')
-rw-r--r--sys/gnu/ext2fs/ext2_extern.h4
-rw-r--r--sys/gnu/ext2fs/ext2_subr.c9
-rw-r--r--sys/gnu/fs/ext2fs/ext2_extern.h4
-rw-r--r--sys/gnu/fs/ext2fs/ext2_subr.c9
4 files changed, 10 insertions, 16 deletions
diff --git a/sys/gnu/ext2fs/ext2_extern.h b/sys/gnu/ext2fs/ext2_extern.h
index c7a38be..69340c8 100644
--- a/sys/gnu/ext2fs/ext2_extern.h
+++ b/sys/gnu/ext2fs/ext2_extern.h
@@ -99,10 +99,6 @@ void mark_buffer_dirty __P((struct buf *bh));
*/
#define IS_EXT2_VNODE(vp) (vp->v_mount->mnt_stat.f_type == MOUNT_EXT2FS)
-#ifdef DIAGNOSTIC
-void ext2_checkoverlap __P((struct buf *, struct inode *));
-#endif
-
extern vop_t **ext2_vnodeop_p;
extern vop_t **ext2_specop_p;
extern vop_t **ext2_fifoop_p;
diff --git a/sys/gnu/ext2fs/ext2_subr.c b/sys/gnu/ext2fs/ext2_subr.c
index a70e445..1f1ce96 100644
--- a/sys/gnu/ext2fs/ext2_subr.c
+++ b/sys/gnu/ext2fs/ext2_subr.c
@@ -51,6 +51,8 @@
#include <ufs/ufs/quota.h>
#include <ufs/ufs/inode.h>
+static void ext2_checkoverlap __P((struct buf *, struct inode *));
+
/*
* Return buffer with the contents of block "offset" from the beginning of
* directory "ip". If "res" is non-zero, fill it in with a pointer to the
@@ -85,8 +87,8 @@ ext2_blkatoff(vp, offset, res, bpp)
return (0);
}
-#if defined(KERNEL) && defined(DIAGNOSTIC)
-void
+#ifdef DDB
+static void
ext2_checkoverlap(bp, ip)
struct buf *bp;
struct inode *ip;
@@ -117,5 +119,4 @@ ext2_checkoverlap(bp, ip)
panic("Disk buffer overlap");
}
}
-#endif /* DIAGNOSTIC */
-
+#endif /* DDB */
diff --git a/sys/gnu/fs/ext2fs/ext2_extern.h b/sys/gnu/fs/ext2fs/ext2_extern.h
index c7a38be..69340c8 100644
--- a/sys/gnu/fs/ext2fs/ext2_extern.h
+++ b/sys/gnu/fs/ext2fs/ext2_extern.h
@@ -99,10 +99,6 @@ void mark_buffer_dirty __P((struct buf *bh));
*/
#define IS_EXT2_VNODE(vp) (vp->v_mount->mnt_stat.f_type == MOUNT_EXT2FS)
-#ifdef DIAGNOSTIC
-void ext2_checkoverlap __P((struct buf *, struct inode *));
-#endif
-
extern vop_t **ext2_vnodeop_p;
extern vop_t **ext2_specop_p;
extern vop_t **ext2_fifoop_p;
diff --git a/sys/gnu/fs/ext2fs/ext2_subr.c b/sys/gnu/fs/ext2fs/ext2_subr.c
index a70e445..1f1ce96 100644
--- a/sys/gnu/fs/ext2fs/ext2_subr.c
+++ b/sys/gnu/fs/ext2fs/ext2_subr.c
@@ -51,6 +51,8 @@
#include <ufs/ufs/quota.h>
#include <ufs/ufs/inode.h>
+static void ext2_checkoverlap __P((struct buf *, struct inode *));
+
/*
* Return buffer with the contents of block "offset" from the beginning of
* directory "ip". If "res" is non-zero, fill it in with a pointer to the
@@ -85,8 +87,8 @@ ext2_blkatoff(vp, offset, res, bpp)
return (0);
}
-#if defined(KERNEL) && defined(DIAGNOSTIC)
-void
+#ifdef DDB
+static void
ext2_checkoverlap(bp, ip)
struct buf *bp;
struct inode *ip;
@@ -117,5 +119,4 @@ ext2_checkoverlap(bp, ip)
panic("Disk buffer overlap");
}
}
-#endif /* DIAGNOSTIC */
-
+#endif /* DDB */
OpenPOWER on IntegriCloud