From patchwork Sat Jun 18 14:01:46 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Dickson X-Patchwork-Id: 893092 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p5IE28Om019030 for ; Sat, 18 Jun 2011 14:02:08 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752953Ab1FROCG (ORCPT ); Sat, 18 Jun 2011 10:02:06 -0400 Received: from 178.141.211.66.inaddr.G4.NET ([66.211.141.178]:43290 "EHLO Dobby.Home.4dicksons.org" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752908Ab1FROCF (ORCPT ); Sat, 18 Jun 2011 10:02:05 -0400 Received: from tophat.home.4dicksons.org ([192.168.62.20] helo=tophat.home.4dicksons.org.home.4dicksons.org) by Dobby.Home.4dicksons.org with esmtp (Exim 4.63) (envelope-from ) id 1QXw5v-0004pC-6z; Sat, 18 Jun 2011 10:02:03 -0400 From: Steve Dickson To: Libtirpc Devel List Cc: Linux NFS Mailing List Subject: [PATCH] Do not skip records with nonblocking connections (take 2) Date: Sat, 18 Jun 2011 10:01:46 -0400 Message-Id: <1308405706-3467-1-git-send-email-steved@redhat.com> X-Mailer: git-send-email 1.7.4.4 X-Spam-Score: 1.6 (+) Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Sat, 18 Jun 2011 14:02:08 +0000 (UTC) With non-blocking connections, do not skip records when receiving the streams since entire value messages can be ignored which in cause the entire stream to become out of sync. For example, two mounts simultaneously send two unmaps commands. The first one is read, then the second thrown away due to skipping the record. Skipping this record will cause XDR error later in processing of the stream. Signed-off-by: Steve Dickson --- src/svc_vc.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/svc_vc.c b/src/svc_vc.c index aaaf2d7..87406f1 100644 --- a/src/svc_vc.c +++ b/src/svc_vc.c @@ -610,7 +610,11 @@ svc_vc_recv(xprt, msg) } xdrs->x_op = XDR_DECODE; - (void)xdrrec_skiprecord(xdrs); + /* + * No need skip records with nonblocking connections + */ + if (cd->nonblock == FALSE) + (void)xdrrec_skiprecord(xdrs); if (xdr_callmsg(xdrs, msg)) { cd->x_id = msg->rm_xid; return (TRUE);