Thanks, applying.--b.
On Mon, Dec 09, 2013 at 06:23:46PM +0800, Kinglong Mee wrote:
> host_err was only used for nfs4_acl_new.
> This patch delete it, and return nfserr_jukebox directly.
>
> Signed-off-by: Kinglong Mee <kinglongmee@xxxxxxxxx>
> ---
> fs/nfsd/nfs4xdr.c | 12 +++---------
> 1 file changed, 3 insertions(+), 9 deletions(-)
>
> diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
> index fd48536..91afb1c 100644
> --- a/fs/nfsd/nfs4xdr.c
> +++ b/fs/nfsd/nfs4xdr.c
> @@ -252,7 +252,6 @@ nfsd4_decode_fattr(struct nfsd4_compoundargs *argp, u32 *bmval,
> int expected_len, len = 0;
> u32 dummy32;
> char *buf;
> - int host_err;
>
> DECODE_HEAD;
> iattr->ia_valid = 0;
> @@ -279,10 +278,9 @@ nfsd4_decode_fattr(struct nfsd4_compoundargs *argp, u32 *bmval,
> return nfserr_resource;
>
> *acl = nfs4_acl_new(nace);
> - if (*acl == NULL) {
> - host_err = -ENOMEM;
> - goto out_nfserr;
> - }
> + if (*acl == NULL)
> + return nfserr_jukebox;
> +
> defer_free(argp, kfree, *acl);
>
> (*acl)->naces = nace;
> @@ -420,10 +418,6 @@ nfsd4_decode_fattr(struct nfsd4_compoundargs *argp, u32 *bmval,
> goto xdr_error;
>
> DECODE_TAIL;
> -
> -out_nfserr:
> - status = nfserrno(host_err);
> - goto out;
> }
>
> static __be32
> --
> 1.8.4.2
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
