From mboxrd@z Thu Jan 1 00:00:00 1970 From: Trond Myklebust Subject: Re: [PATCH] nfs41: get rid of unused struct nfs41_exchange_id_res members Date: Tue, 05 May 2009 15:34:13 -0400 Message-ID: <1241552053.5174.44.camel@heimdal.trondhjem.org> References: <89c397150905010756h503498d4n9fd2f8bb3ce403c3@mail.gmail.com> <1241208886-5748-1-git-send-email-bhalevy@panasas.com> Mime-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: 7bit Return-path: Received: from mail-out2.uio.no ([129.240.10.58]:39656 "EHLO mail-out2.uio.no" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752401AbZEETeb (ORCPT ); Tue, 5 May 2009 15:34:31 -0400 In-Reply-To: <1241208886-5748-1-git-send-email-bhalevy@panasas.com> Sender: linux-next-owner@vger.kernel.org List-ID: To: Benny Halevy Cc: Andy Adamson , pnfs@linux-nfs.org, Stephen Rothwell , linux-next@vger.kernel.org On Fri, 2009-05-01 at 23:14 +0300, Benny Halevy wrote: > struct nfs41_exchange_id_res is currently allocated on the stack > insanely taking over 2K of stack space due to the NFS4_OPAQUE_LIMIT (1K( > byte arrays embedded in server_owner and server_scope. > Since these are not in use yet, this patch gets rid of them for the > time being. > > Signed-off-by: Benny Halevy > --- > fs/nfs/nfs4xdr.c | 27 ++++++++++++++------------- > include/linux/nfs_xdr.h | 3 --- > 2 files changed, 14 insertions(+), 16 deletions(-) > > diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c > index 80af0ae..3350d19 100644 > --- a/fs/nfs/nfs4xdr.c > +++ b/fs/nfs/nfs4xdr.c > @@ -4185,8 +4185,8 @@ static int decode_delegreturn(struct xdr_stream *xdr) > static int decode_exchange_id(struct xdr_stream *xdr, > struct nfs41_exchange_id_res *res) > { > - uint32_t *p; > - int status, dummy; > + uint32_t *p, dummy; > + int status; > struct nfs_client *clp = res->client; > > status = decode_op_hdr(xdr, OP_EXCHANGE_ID); > @@ -4204,25 +4204,26 @@ static int decode_exchange_id(struct xdr_stream *xdr, > if (dummy != SP4_NONE) > return -EIO; > > - /* minor_id */ > + /* Throw away minor_id */ > READ_BUF(8); > - READ64(res->server_owner.minor_id); > + p += 8; ^^^^^^^^ Err... This isn't the same thing at all! You're suddenly skipping 10=words instead of the original 2. READ_BUF() will already take care of updating the 'p' pointer. > > - /* Major id */ > + /* Throw away Major id */ > READ_BUF(4); > - READ32(res->server_owner.major_id_sz); > - READ_BUF(res->server_owner.major_id_sz); > - COPYMEM(res->server_owner.major_id, res->server_owner.major_id_sz); > + READ32(dummy); > + READ_BUF(dummy); > + p += XDR_QUADLEN(dummy); ^^^^^^^^^^^^^^^^^^^^^^^^^ Ditto. You're skipping 2*dummy words. > > - /* server_scope */ > + /* Throw away server_scope */ > READ_BUF(4); > - READ32(res->server_scope.server_scope_sz); > - READ_BUF(res->server_scope.server_scope_sz); > - COPYMEM(res->server_scope.server_scope, > - res->server_scope.server_scope_sz); > + READ32(dummy); > + READ_BUF(dummy); > + p += XDR_QUADLEN(dummy); ^^^^^^^^^^^^^^^^^^^^^^^^ Ditto > + > /* Throw away Implementation id array */ > READ_BUF(4); > READ32(dummy); > + READ_BUF(dummy); > p += XDR_QUADLEN(dummy); ^^^^^^^^^^^^^^^^^^^^^^^^ Ditto > > return 0; > diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h > index 071a6d1..62f63fb 100644 > --- a/include/linux/nfs_xdr.h > +++ b/include/linux/nfs_xdr.h > @@ -925,9 +925,6 @@ struct server_scope { > struct nfs41_exchange_id_res { > struct nfs_client *client; > u32 flags; > - struct server_owner server_owner; > - struct server_scope server_scope; > - struct nfs_impl_id4 impl_id; > }; > > struct nfs41_create_session_args {