linux-nfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "J. Bruce Fields" <bfields@fieldses.org>
To: Kinglong Mee <kinglongmee@gmail.com>
Cc: linux-nfs@vger.kernel.org
Subject: Re: [PATCH] nfsd: using nfsd4_encode_noop for encoding destroy_session/free_stateid
Date: Thu, 12 Dec 2013 11:32:05 -0500	[thread overview]
Message-ID: <20131212163205.GH11521@fieldses.org> (raw)
In-Reply-To: <52A5A3B7.2000303@gmail.com>

On Mon, Dec 09, 2013 at 07:04:23PM +0800, Kinglong Mee wrote:
> Get rid of the extra code, using nfsd4_encode_noop for encoding destroy_session and free_stateid.
> And, delete unused argument (fr_status) int nfsd4_free_stateid.

Thanks, applying.--b.

> 
> Signed-off-by: Kinglong Mee <kinglongmee@gmail.com>
> ---
>  fs/nfsd/nfs4xdr.c | 26 ++------------------------
>  fs/nfsd/xdr4.h    |  1 -
>  2 files changed, 2 insertions(+), 25 deletions(-)
> 
> diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
> index 91afb1c..b0b886e 100644
> --- a/fs/nfsd/nfs4xdr.c
> +++ b/fs/nfsd/nfs4xdr.c
> @@ -3463,28 +3463,6 @@ nfsd4_encode_create_session(struct nfsd4_compoundres *resp, __be32 nfserr,
>  }
>  
>  static __be32
> -nfsd4_encode_destroy_session(struct nfsd4_compoundres *resp, __be32 nfserr,
> -			     struct nfsd4_destroy_session *destroy_session)
> -{
> -	return nfserr;
> -}
> -
> -static __be32
> -nfsd4_encode_free_stateid(struct nfsd4_compoundres *resp, __be32 nfserr,
> -			  struct nfsd4_free_stateid *free_stateid)
> -{
> -	__be32 *p;
> -
> -	if (nfserr)
> -		return nfserr;
> -
> -	RESERVE_SPACE(4);
> -	*p++ = nfserr;
> -	ADJUST_ARGS();
> -	return nfserr;
> -}
> -
> -static __be32
>  nfsd4_encode_sequence(struct nfsd4_compoundres *resp, __be32 nfserr,
>  		      struct nfsd4_sequence *seq)
>  {
> @@ -3582,8 +3560,8 @@ static nfsd4_enc nfsd4_enc_ops[] = {
>  	[OP_BIND_CONN_TO_SESSION] = (nfsd4_enc)nfsd4_encode_bind_conn_to_session,
>  	[OP_EXCHANGE_ID]	= (nfsd4_enc)nfsd4_encode_exchange_id,
>  	[OP_CREATE_SESSION]	= (nfsd4_enc)nfsd4_encode_create_session,
> -	[OP_DESTROY_SESSION]	= (nfsd4_enc)nfsd4_encode_destroy_session,
> -	[OP_FREE_STATEID]	= (nfsd4_enc)nfsd4_encode_free_stateid,
> +	[OP_DESTROY_SESSION]	= (nfsd4_enc)nfsd4_encode_noop,
> +	[OP_FREE_STATEID]	= (nfsd4_enc)nfsd4_encode_noop,
>  	[OP_GET_DIR_DELEGATION]	= (nfsd4_enc)nfsd4_encode_noop,
>  	[OP_GETDEVICEINFO]	= (nfsd4_enc)nfsd4_encode_noop,
>  	[OP_GETDEVICELIST]	= (nfsd4_enc)nfsd4_encode_noop,
> diff --git a/fs/nfsd/xdr4.h b/fs/nfsd/xdr4.h
> index b3ed644..916a407 100644
> --- a/fs/nfsd/xdr4.h
> +++ b/fs/nfsd/xdr4.h
> @@ -374,7 +374,6 @@ struct nfsd4_test_stateid {
>  
>  struct nfsd4_free_stateid {
>  	stateid_t	fr_stateid;         /* request */
> -	__be32		fr_status;          /* response */
>  };
>  
>  /* also used for NVERIFY */
> -- 
> 1.8.4.2

      reply	other threads:[~2013-12-12 16:32 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-12-09 11:04 [PATCH] nfsd: using nfsd4_encode_noop for encoding destroy_session/free_stateid Kinglong Mee
2013-12-12 16:32 ` J. Bruce Fields [this message]

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=20131212163205.GH11521@fieldses.org \
    --to=bfields@fieldses.org \
    --cc=kinglongmee@gmail.com \
    --cc=linux-nfs@vger.kernel.org \
    /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).