From f35416a7fff2f0105ea0816611f16ed308998177 Mon Sep 17 00:00:00 2001 From: Derrick Brashear Date: Sat, 13 Dec 2003 00:04:56 +0000 Subject: [PATCH 1/1] dir-header-dont-conflict-with-kernel-protos-20031208 kernel module has disjoint buffer package --- src/dir/dir.h | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/dir/dir.h b/src/dir/dir.h index e01c1af..fa5ecfc 100644 --- a/src/dir/dir.h +++ b/src/dir/dir.h @@ -99,15 +99,20 @@ extern struct DirEntry *GetBlob(void *dir, afs_int32 blobno); extern int DirHash(register char *string); extern int DStat(int *abuffers, int *acalls, int *aios); -extern int DInit(int abuffers); -extern void *DRead(register afs_int32 *fid, register int page); extern void DRelease(register struct buffer *bp, int flag); extern int DVOffset(register void *ap); -extern void DZap(register afs_int32 *fid); extern int DFlushVolume(register afs_int32 vid); extern int DFlushEntry(register afs_int32 *fid); + +/* The kernel uses different versions of these, and prototypes them + in afs_prototypes.h */ +#ifndef KERNEL +extern int DInit(int abuffers); +extern void *DRead(register afs_int32 *fid, register int page); extern int DFlush(); extern void *DNew(register afs_int32 *fid, register int page); +extern void DZap(register afs_int32 *fid); +#endif #ifdef KERNEL extern int afs_dir_NameBlobs(char *name); -- 1.9.4