linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Trond Myklebust <trond.myklebust@fys.uio.no>
To: Benny Halevy <bhalevy@panasas.com>
Cc: Andy Adamson <andros@netapp.com>,
	pnfs@linux-nfs.org, Stephen Rothwell <sfr@canb.auug.org.au>,
	linux-next@vger.kernel.org
Subject: Re: [PATCH] nfs41: get rid of unused struct nfs41_exchange_id_res members
Date: Tue, 05 May 2009 15:34:13 -0400	[thread overview]
Message-ID: <1241552053.5174.44.camel@heimdal.trondhjem.org> (raw)
In-Reply-To: <1241208886-5748-1-git-send-email-bhalevy@panasas.com>

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 <bhalevy@panasas.com>
> ---
>  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 {

  reply	other threads:[~2009-05-05 19:34 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-05-01  3:15 linux-next: nfs tree build warning Stephen Rothwell
2009-05-01  3:22 ` Trond Myklebust
2009-05-01 12:19   ` Benny Halevy
2009-05-01 14:56     ` William A. (Andy) Adamson
2009-05-01 20:14       ` [PATCH] nfs41: get rid of unused struct nfs41_exchange_id_res members Benny Halevy
2009-05-05 19:34         ` Trond Myklebust [this message]
2009-05-05 19:39           ` Trond Myklebust
2009-05-05 19:41             ` Trond Myklebust
2009-05-05 20:28               ` Benny Halevy
2009-05-05 20:35                 ` Benny Halevy
2009-05-05 22:12                   ` Trond Myklebust
2009-05-05 22:15                     ` Benny Halevy
2009-05-05 22:39                       ` Trond Myklebust
2009-05-07 15:56                         ` Benny Halevy
2009-05-07 16:00                           ` [PATCH 1/6] nfs41: Ignoring impid in decode_exchange_id is missing a READ_BUF Benny Halevy
2009-05-07 16:00                           ` [PATCH 2/6] nfs41: fix Xcode_exchange_id's xdr Xcoding pointer type Benny Halevy
2009-05-07 16:00                           ` [PATCH 3/6] nfs41: get rid of unused struct nfs41_exchange_id_res members Benny Halevy
2009-05-07 16:00                           ` [PATCH 4/6] nfs41: fix Xcode_create_session's xdr Xcoding pointer type Benny Halevy
2009-05-07 16:00                           ` [PATCH 5/6] nfs41: refactor decoding of channel attributes Benny Halevy
2009-05-07 16:01                           ` [PATCH 6/6] nfs41: fix encode_destroy_session's xdr Xcoding pointer type Benny Halevy
2009-05-05 22:43                       ` [pnfs] [PATCH] nfs41: get rid of unused struct nfs41_exchange_id_res members J. Bruce Fields
2009-06-09  9:13 ` linux-next: nfs tree build warning Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1241552053.5174.44.camel@heimdal.trondhjem.org \
    --to=trond.myklebust@fys.uio.no \
    --cc=andros@netapp.com \
    --cc=bhalevy@panasas.com \
    --cc=linux-next@vger.kernel.org \
    --cc=pnfs@linux-nfs.org \
    --cc=sfr@canb.auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).