diff -r c9549d324226 fuse_module/fuse.c --- a/fuse_module/fuse.c Sat Feb 11 01:30:59 2006 +0200 +++ b/fuse_module/fuse.c Wed May 02 11:13:41 2007 +0200 @@ -4215,10 +4215,8 @@ fuse_read_biobackend(struct fuse_io_data #if _DEBUG prettyprint(bp->b_data, 48); printf("\n"); -#if ZERO_PAD_INCOMPLETE_BUFS prettyprint(bp->b_data + PAGE_SIZE, 48); printf("\n"); -#endif #endif if (err) { brelse(bp); @@ -4492,13 +4490,6 @@ fuse_dir_buffeater(struct uio *uio, size err = ((cou == 1) ? -1 : 0); break; } - -#ifdef ZERO_PAD_INCOMPLETE_BUFS - if (isbzero(buf), FUSE_NAME_OFFSET) { - err = -1; - break; - } -#endif /* Sanity checks */ @@ -5741,23 +5732,16 @@ fuse_strategy_i(struct vnode *vp, struct chunksize, (long long unsigned)fri->offset, respsize); if (respsize < chunksize) { -#ifdef ZERO_PAD_INCOMPLETE_BUFS /* - * "if we don't get enough data, just fill the - * rest with zeros." - * in nfs context this means a hole in the - * file, I don't know what to do with this - * here... [we just get a buch of zeroes - * instead of EOF, baaad] + * if we don't get enough data, just fill the + * rest with zeros. */ DEBUG("zeroing tail of %ld bytes\n", bp->b_resid); bzero((char *)bp->b_data + bp->b_bcount - bp->b_resid, bp->b_resid); - bp->b_resid = 0; -#else + break; -#endif } ticket_refresh(fdi.tick); DEBUG("bp->b_data %p\n", bp->b_data);