From patchwork Fri Apr 18 19:50:25 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 340421 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id C57C41400F9 for ; Sat, 19 Apr 2014 06:10:24 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754632AbaDRUKT (ORCPT ); Fri, 18 Apr 2014 16:10:19 -0400 Received: from mail.tpi.com ([74.45.170.26]:58382 "EHLO mail.tpi.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753068AbaDRUKR (ORCPT ); Fri, 18 Apr 2014 16:10:17 -0400 X-Greylist: delayed 1178 seconds by postgrey-1.27 at vger.kernel.org; Fri, 18 Apr 2014 16:10:17 EDT Received: from salmon.rtg.net (mail.tpi.com [10.0.0.205]) by mail.tpi.com (Postfix) with ESMTP id D1AD03541CF; Fri, 18 Apr 2014 12:50:41 -0700 (PDT) Received: by salmon.rtg.net (Postfix, from userid 1000) id C3DFD246A0; Fri, 18 Apr 2014 13:50:38 -0600 (MDT) From: Tim Gardner To: linux-nfs@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Tim Gardner , Trond Myklebust , "J. Bruce Fields" , "David S. Miller" Subject: [PATCH net-next] xprtrdma: rpcrdma_register_default_external: Silence frame size warning Date: Fri, 18 Apr 2014 13:50:25 -0600 Message-Id: <1397850625-44074-1-git-send-email-tim.gardner@canonical.com> X-Mailer: git-send-email 1.7.9.5 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org net/sunrpc/xprtrdma/verbs.c: In function 'rpcrdma_register_default_external': net/sunrpc/xprtrdma/verbs.c:1774:1: warning: the frame size of 1048 bytes is larger than 1024 bytes [-Wframe-larger-than=] gcc version 4.8.2, x86_64-linux-gnu Cc: Trond Myklebust Cc: "J. Bruce Fields" Cc: "David S. Miller" Signed-off-by: Tim Gardner --- net/sunrpc/xprtrdma/verbs.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c index 93726560..8130349 100644 --- a/net/sunrpc/xprtrdma/verbs.c +++ b/net/sunrpc/xprtrdma/verbs.c @@ -1736,9 +1736,13 @@ rpcrdma_register_default_external(struct rpcrdma_mr_seg *seg, int mem_priv = (writing ? IB_ACCESS_REMOTE_WRITE : IB_ACCESS_REMOTE_READ); struct rpcrdma_mr_seg *seg1 = seg; - struct ib_phys_buf ipb[RPCRDMA_MAX_DATA_SEGS]; + struct ib_phys_buf *ipb; int len, i, rc = 0; + ipb = kmalloc(sizeof(*ipb) * RPCRDMA_MAX_DATA_SEGS, GFP_ATOMIC); + if (!ipb) + return -ENOMEM; + if (*nsegs > RPCRDMA_MAX_DATA_SEGS) *nsegs = RPCRDMA_MAX_DATA_SEGS; for (len = 0, i = 0; i < *nsegs;) { @@ -1770,6 +1774,8 @@ rpcrdma_register_default_external(struct rpcrdma_mr_seg *seg, seg1->mr_len = len; } *nsegs = i; + + kfree(ipb); return rc; }