Return-Path: linux-nfs-owner@vger.kernel.org Received: from smtp.opengridcomputing.com ([72.48.136.20]:37311 "EHLO smtp.opengridcomputing.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756646AbaIWTmb (ORCPT ); Tue, 23 Sep 2014 15:42:31 -0400 From: "Steve Wise" To: "'Chuck Lever'" Cc: "'J. Bruce Fields'" , , References: <20140922200547.19909.68196.stgit@build.ogc.int> <465554E1-802A-4D37-8032-4E99B96B8BFB@oracle.com> In-Reply-To: <465554E1-802A-4D37-8032-4E99B96B8BFB@oracle.com> Subject: RE: [PATCH V2] svcrdma: Advertise the correct max payload Date: Tue, 23 Sep 2014 14:42:34 -0500 Message-ID: <00a701cfd766$855044e0$8ff0cea0$@opengridcomputing.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Sender: linux-nfs-owner@vger.kernel.org List-ID: > > diff --git a/net/sunrpc/xprtrdma/xprt_rdma.h b/net/sunrpc/xprtrdma/xprt_rdma.h > > index c419498..a9cf5c3 100644 > > --- a/net/sunrpc/xprtrdma/xprt_rdma.h > > +++ b/net/sunrpc/xprtrdma/xprt_rdma.h > > @@ -392,4 +392,8 @@ extern struct kmem_cache *svc_rdma_ctxt_cachep; > > /* Workqueue created in svc_rdma.c */ > > extern struct workqueue_struct *svc_rdma_wq; > > > > +#define RPCSVC_MAXPAYLOAD_RDMA \ > > + (RPCSVC_MAXPAYLOAD < (RPCRDMA_MAX_DATA_SEGS << PAGE_SHIFT) ? \ > > + RPCSVC_MAXPAYLOAD : (RPCRDMA_MAX_DATA_SEGS << PAGE_SHIFT)) > > + > > Couldn't you use: > > #if RPCSVC_MAXPAYLOAD < (RPCRDMA_MAX_DATA_SEGS << PAGE_SHIFT) > #define RPCSVC_MAXPAYLOAD_RDMA RPC_MAXPAYLOAD > #else > #define RPCSVC_MAXPAYLOAD_RDMA (RPCRDMA_MAX_DATA_SEGS << PAGE_SHIFT) > #endif > > That seems more idiomatic. Sure. That makes it easier to read in my opinion too. I'll send out V3 with this change. Thanks, Steve.