From patchwork Fri Nov 16 21:31:15 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Rees X-Patchwork-Id: 1757331 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 62C13DF288 for ; Fri, 16 Nov 2012 21:31:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753629Ab2KPVbY (ORCPT ); Fri, 16 Nov 2012 16:31:24 -0500 Received: from mout.perfora.net ([74.208.4.194]:59593 "EHLO mout.perfora.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753618Ab2KPVbX (ORCPT ); Fri, 16 Nov 2012 16:31:23 -0500 Received: from rees.org (74-126-0-171.static.123.net [74.126.0.171]) by mrelay.perfora.net (node=mrus3) with ESMTP (Nemesis) id 0LuOlj-1T7bc201KB-0114FY; Fri, 16 Nov 2012 16:31:20 -0500 From: Jim Rees To: Trond Myklebust Cc: linux-nfs@vger.kernel.org Subject: [PATCH] NFS: Reduce stack use in encode_exchange_id() Date: Fri, 16 Nov 2012 16:31:15 -0500 Message-Id: <1353101475-11613-1-git-send-email-rees@umich.edu> X-Mailer: git-send-email 1.7.9.5 X-Provags-ID: V02:K0:S7YkIvLkqkwI1xLlKV36qs7iCxk2/XwjSV17au94Gs0 A+jG1jeu0vQDfobLIdHq9E9DNUnBcppMHGE41a68QzrgWrybns GJzmrY3m5fnhMQHRI+HfoTNKDUuT31GnHdiGtujGLPG/vZBDGw 3w3C3JEpcMlj3JGK2t6bYrgW99AxgupxIqQV/hmSIoTZ324v4f ZBJaPdhlw+RjROWpUMJv1iWmAE7brKQWBWy3ss5yLGhmz4PiEE eWqqDyqHdCrxigtR4z7AU5WzmedN18d9V0B6jdkB0v6IzmLdNa OnX6vWijdrwyQaKT9rnS7upP0i1OOTTaptYzWKcYrz2gpoc9fb t1k6MVa+4VLBSxPD6kENCvkm5c7bZ/GrT6sDUS1rv Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org encode_exchange_id() uses more stack space than necessary, giving a compile time warning. Reduce the size of the static buffer for implementation name. Signed-off-by: Jim Rees Reviewed-by: "Adamson, Dros" --- fs/nfs/nfs4xdr.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c index 672d9b0..e9c101d 100644 --- a/fs/nfs/nfs4xdr.c +++ b/fs/nfs/nfs4xdr.c @@ -1706,12 +1706,15 @@ static void encode_bind_conn_to_session(struct xdr_stream *xdr, *p = 0; /* use_conn_in_rdma_mode = False */ } +#define IMPL_NAME_LIMIT (sizeof(utsname()->sysname) + sizeof(utsname()->release) + \ + sizeof(utsname()->version) + sizeof(utsname()->machine) + 8) + static void encode_exchange_id(struct xdr_stream *xdr, struct nfs41_exchange_id_args *args, struct compound_hdr *hdr) { __be32 *p; - char impl_name[NFS4_OPAQUE_LIMIT]; + char impl_name[IMPL_NAME_LIMIT]; int len = 0; encode_op_hdr(xdr, OP_EXCHANGE_ID, decode_exchange_id_maxsz, hdr); @@ -1726,7 +1729,7 @@ static void encode_exchange_id(struct xdr_stream *xdr, if (send_implementation_id && sizeof(CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN) > 1 && sizeof(CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN) - <= NFS4_OPAQUE_LIMIT + 1) + <= sizeof(impl_name) + 1) len = snprintf(impl_name, sizeof(impl_name), "%s %s %s %s", utsname()->sysname, utsname()->release, utsname()->version, utsname()->machine);