From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tom Tucker Subject: [RFC, PATCH 4/15] knfsd: map null socket to SOCK_STREAM in svc_max_payload Date: Fri, 18 May 2007 12:45:07 -0500 Message-ID: <1179510307.23385.117.camel@trinity.ogc.int> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Cc: Neil Brown , Tom Talpey , Peter Leckie , Greg Banks To: Linux NFS Mailing List Return-path: Received: from sc8-sf-mx2-b.sourceforge.net ([10.3.1.92] helo=mail.sourceforge.net) by sc8-sf-list2-new.sourceforge.net with esmtp (Exim 4.43) id 1Hp6Vq-0000ra-GB for nfs@lists.sourceforge.net; Fri, 18 May 2007 10:45:10 -0700 Received: from rrcs-71-42-183-126.sw.biz.rr.com ([71.42.183.126] helo=smtp.opengridcomputing.com) by mail.sourceforge.net with esmtp (Exim 4.44) id 1Hp6Vt-00086g-6h for nfs@lists.sourceforge.net; Fri, 18 May 2007 10:45:13 -0700 List-Id: "Discussion of NFS under Linux development, interoperability, and testing." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: nfs-bounces@lists.sourceforge.net Errors-To: nfs-bounces@lists.sourceforge.net The svc_max_payload function looks into the sk_sock structure to determine what the reported max payload should be. For RDMA, there is no socket. This change effectively maps a NULL sk_sock to SOCK_STREAM. Signed-off-by: Tom Tucker --- net/sunrpc/svc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c index 9fec17d..b343db8 100644 --- a/net/sunrpc/svc.c +++ b/net/sunrpc/svc.c @@ -1024,7 +1024,7 @@ u32 svc_max_payload(const struct svc_rqs { int max = RPCSVC_MAXPAYLOAD_TCP; - if (rqstp->rq_sock->sk_sock->type == SOCK_DGRAM) + if (rqstp->rq_sock->sk_sock && rqstp->rq_sock->sk_sock->type == SOCK_DGRAM) max = RPCSVC_MAXPAYLOAD_UDP; if (rqstp->rq_server->sv_max_payload < max) max = rqstp->rq_server->sv_max_payload; ------------------------------------------------------------------------- This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ _______________________________________________ NFS maillist - NFS@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/nfs