Commit eba1c99c authored by Kinglong Mee's avatar Kinglong Mee Committed by J. Bruce Fields

nfsd: clean up unnecessary temporary variable in nfsd4_decode_fattr

host_err was only used for nfs4_acl_new.
This patch delete it, and return nfserr_jukebox directly.
Signed-off-by: default avatarKinglong Mee <kinglongmee@gmail.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 43212cc7
...@@ -276,7 +276,6 @@ nfsd4_decode_fattr(struct nfsd4_compoundargs *argp, u32 *bmval, ...@@ -276,7 +276,6 @@ nfsd4_decode_fattr(struct nfsd4_compoundargs *argp, u32 *bmval,
int expected_len, len = 0; int expected_len, len = 0;
u32 dummy32; u32 dummy32;
char *buf; char *buf;
int host_err;
DECODE_HEAD; DECODE_HEAD;
iattr->ia_valid = 0; iattr->ia_valid = 0;
...@@ -303,10 +302,9 @@ nfsd4_decode_fattr(struct nfsd4_compoundargs *argp, u32 *bmval, ...@@ -303,10 +302,9 @@ nfsd4_decode_fattr(struct nfsd4_compoundargs *argp, u32 *bmval,
return nfserr_resource; return nfserr_resource;
*acl = nfs4_acl_new(nace); *acl = nfs4_acl_new(nace);
if (*acl == NULL) { if (*acl == NULL)
host_err = -ENOMEM; return nfserr_jukebox;
goto out_nfserr;
}
defer_free(argp, kfree, *acl); defer_free(argp, kfree, *acl);
(*acl)->naces = nace; (*acl)->naces = nace;
...@@ -444,10 +442,6 @@ nfsd4_decode_fattr(struct nfsd4_compoundargs *argp, u32 *bmval, ...@@ -444,10 +442,6 @@ nfsd4_decode_fattr(struct nfsd4_compoundargs *argp, u32 *bmval,
goto xdr_error; goto xdr_error;
DECODE_TAIL; DECODE_TAIL;
out_nfserr:
status = nfserrno(host_err);
goto out;
} }
static __be32 static __be32
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment