Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NBPG may not be computable by the preprocessor. Make "do clustered io" 

a run-time decision. Note: the compiler can optimize it away.
This commit is contained in:
pk 1995-12-01 00:47:33 +00:00
parent c9f22dd6ec
commit fe934606c7
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/isofs/cd9660/cd9660_vnops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cd9660_vnops.c,v 1.25 1995/11/08 22:26:24 cgd Exp $ */ /* $NetBSD: cd9660_vnops.c,v 1.26 1995/12/01 00:47:33 pk Exp $ */
/*- /*-
* Copyright (c) 1994 * Copyright (c) 1994
@ -233,16 +233,15 @@ cd9660_getattr(ap)
return (0); return (0);
} }
#if ISO_DEFAULT_BLOCK_SIZE >= NBPG
#ifdef DEBUG #ifdef DEBUG
extern int doclusterread; extern int doclusterread;
#else #else
#define doclusterread 1 #define doclusterread 1
#endif #endif
#else
/* XXX until cluster routines can handle block sizes less than one page */ /* XXX until cluster routines can handle block sizes less than one page */
#define doclusterread 0 #define cd9660_doclusterread \
#endif (doclusterread && (ISO_DEFAULT_BLOCK_SIZE >= NBPG))
/* /*
* Vnode op for reading. * Vnode op for reading.
@ -284,7 +283,7 @@ cd9660_read(ap)
n = diff; n = diff;
size = blksize(imp, ip, lbn); size = blksize(imp, ip, lbn);
rablock = lbn + 1; rablock = lbn + 1;
if (doclusterread) { if (cd9660_doclusterread) {
if (lblktosize(imp, rablock) <= ip->i_size) if (lblktosize(imp, rablock) <= ip->i_size)
error = cluster_read(vp, (off_t)ip->i_size, error = cluster_read(vp, (off_t)ip->i_size,
lbn, size, NOCRED, &bp); lbn, size, NOCRED, &bp);