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

nfs_doio_read: on short read, zero out the rest of the buffer unconditionally. 

we can't rely on n_size here because it can be changed under us.
This commit is contained in:
yamt 2004-07-18 07:43:00 +00:00
parent 1c77f27a7a
commit e9bca9a46e
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sys/nfs/nfs_bio.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: nfs_bio.c,v 1.118 2004/06/11 12:26:31 yamt Exp $ */
/* $NetBSD: nfs_bio.c,v 1.119 2004/07/18 07:43:00 yamt Exp $ */
/*
* Copyright (c) 1989, 1993
@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: nfs_bio.c,v 1.118 2004/06/11 12:26:31 yamt Exp $");
__KERNEL_RCSID(0, "$NetBSD: nfs_bio.c,v 1.119 2004/07/18 07:43:00 yamt Exp $");
#include "opt_nfs.h"
#include "opt_ddb.h"
@ -894,19 +894,18 @@ nfs_doio_read(bp, uiop)
int diff, len;
/*
* If len > 0, there is a hole in the file and
* If uio_resid > 0, there is a hole in the file and
* no writes after the hole have been pushed to
* the server yet.
* the server yet or the file has been truncated
* on the server.
* Just zero fill the rest of the valid area.
*/
KASSERT(vp->v_size >=
uiop->uio_offset + uiop->uio_resid);
diff = bp->b_bcount - uiop->uio_resid;
len = np->n_size - ((((off_t)bp->b_blkno) << DEV_BSHIFT)
+ diff);
if (len > 0) {
len = MIN(len, uiop->uio_resid);
memset((char *)bp->b_data + diff, 0, len);
}
len = uiop->uio_resid;
memset((char *)bp->b_data + diff, 0, len);
}
if (uiop->uio_procp && (vp->v_flag & VTEXT) &&
(((nmp->nm_flag & NFSMNT_NQNFS) &&