Messages in this thread Patch in this message | | | Date | Tue, 19 Jan 1999 22:06:01 +0000 (GMT) | From | Dave Airlie <> | Subject | [PATCH] NFS over TCP against pre-8 (fixes last bug reported) |
| |
Hi Linus, and all
Can you please apply the attached patch to your next release of 2.2pre or to 2.2final .. it is against 2.2pre8 and fixes the NFS over TCP linux client/server conflict I reported about 20 mins before I posted this :-)
This should fix NFS over TCP once and for all if not I'll be most displeased :-)
Dave.
------------ David Airlie, David.Airlie@ul.ie,airlied@skynet -------- Telecommunications Research Centre, ECE Dept, University of Limerick \ http://www.csn.ul.ie/~airlied -- Telecommunications Researcher \ --- TEL: +353-61-202695 ----------------------------------------------- diff -ur linux-pre8/net/sunrpc/xprt.c linux/net/sunrpc/xprt.c --- linux-pre8/net/sunrpc/xprt.c Tue Jan 19 22:53:14 1999 +++ linux/net/sunrpc/xprt.c Tue Jan 19 22:56:39 1999 @@ -655,10 +655,15 @@ reclen = ntohl(xprt->tcp_reclen); dprintk("RPC: reclen %08x\n", reclen); xprt->tcp_more = (reclen & 0x80000000)? 0 : 1; - if (!(reclen &= 0x7fffffff)) { - printk(KERN_NOTICE "RPC: empty TCP record.\n"); - return -ENOTCONN; /* break connection */ - } + /* + * This code used to check if the following line was false + * and disconnect with ENOTCONN and printk empty TCP record + * I moved that check to earlier in the code and removed the + * return and printk from here - Dave + */ + + reclen &= 0x7fffffff; + xprt->tcp_total += reclen; xprt->tcp_reclen = reclen;
| |