From 11318456a3650ed8bd91e7a021bd7eb2af5779f2 Mon Sep 17 00:00:00 2001 From: David du Colombier <0intro@gmail.com> Date: Tue, 8 Sep 1998 00:00:00 +0000 Subject: [PATCH] Plan 9 from Bell Labs 1998-09-08 --- port/devmnt.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/port/devmnt.c b/port/devmnt.c index a8cb1843393e8b31dd5c228cbbd5202fad7f08dc..a3ad25e925db93ee0a793e621e419e702fbb30e3 100644 --- a/port/devmnt.c +++ b/port/devmnt.c @@ -573,7 +573,7 @@ mntrdwr(int type, Chan *c, void *buf, long n, vlong off) Mntrpc *r; char *uba; int cache; - ulong cnt, nr; + ulong cnt, nr, nreq; m = mntchk(c); uba = buf; @@ -593,9 +593,10 @@ mntrdwr(int type, Chan *c, void *buf, long n, vlong off) r->request.data = uba; r->request.count = limit(n, m->blocksize); mountrpc(m, r); + nreq = r->request.count; nr = r->reply.count; - if(nr > r->request.count) - nr = r->request.count; + if(nr > nreq) + nr = nreq; if(type == Tread) memmove(uba, r->reply.data, nr); @@ -608,7 +609,7 @@ mntrdwr(int type, Chan *c, void *buf, long n, vlong off) uba += nr; cnt += nr; n -= nr; - if(nr != r->request.count || n == 0 || up->nnote) + if(nr != nreq || n == 0 || up->nnote) break; } return cnt;