Fixed configuration and linkage of ext2_checkoverlap().
This commit is contained in:
parent
721a23b12f
commit
5858ada877
@ -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)
|
#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_vnodeop_p;
|
||||||
extern vop_t **ext2_specop_p;
|
extern vop_t **ext2_specop_p;
|
||||||
extern vop_t **ext2_fifoop_p;
|
extern vop_t **ext2_fifoop_p;
|
||||||
|
@ -51,6 +51,8 @@
|
|||||||
#include <ufs/ufs/quota.h>
|
#include <ufs/ufs/quota.h>
|
||||||
#include <ufs/ufs/inode.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
|
* 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
|
* 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);
|
return (0);
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(KERNEL) && defined(DIAGNOSTIC)
|
#ifdef DDB
|
||||||
void
|
static void
|
||||||
ext2_checkoverlap(bp, ip)
|
ext2_checkoverlap(bp, ip)
|
||||||
struct buf *bp;
|
struct buf *bp;
|
||||||
struct inode *ip;
|
struct inode *ip;
|
||||||
@ -117,5 +119,4 @@ ext2_checkoverlap(bp, ip)
|
|||||||
panic("Disk buffer overlap");
|
panic("Disk buffer overlap");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif /* DIAGNOSTIC */
|
#endif /* DDB */
|
||||||
|
|
||||||
|
@ -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)
|
#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_vnodeop_p;
|
||||||
extern vop_t **ext2_specop_p;
|
extern vop_t **ext2_specop_p;
|
||||||
extern vop_t **ext2_fifoop_p;
|
extern vop_t **ext2_fifoop_p;
|
||||||
|
@ -51,6 +51,8 @@
|
|||||||
#include <ufs/ufs/quota.h>
|
#include <ufs/ufs/quota.h>
|
||||||
#include <ufs/ufs/inode.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
|
* 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
|
* 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);
|
return (0);
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(KERNEL) && defined(DIAGNOSTIC)
|
#ifdef DDB
|
||||||
void
|
static void
|
||||||
ext2_checkoverlap(bp, ip)
|
ext2_checkoverlap(bp, ip)
|
||||||
struct buf *bp;
|
struct buf *bp;
|
||||||
struct inode *ip;
|
struct inode *ip;
|
||||||
@ -117,5 +119,4 @@ ext2_checkoverlap(bp, ip)
|
|||||||
panic("Disk buffer overlap");
|
panic("Disk buffer overlap");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif /* DIAGNOSTIC */
|
#endif /* DDB */
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user