aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKinglong Mee <kinglongmee@gmail.com>2013-12-09 05:23:46 -0500
committerJ. Bruce Fields <bfields@redhat.com>2014-01-03 13:44:23 -0500
commiteba1c99ce4590506516ec801d991e36aa8b0d436 (patch)
treeae63a31abbce62b6cdb86420e5ac2468861b7add
parent43212cc7dfee0ca33d1f0f23652c70317ee031e6 (diff)
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: Kinglong Mee <kinglongmee@gmail.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
-rw-r--r--fs/nfsd/nfs4xdr.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index 776d2f639d6e..b77f6bdd522a 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -276,7 +276,6 @@ nfsd4_decode_fattr(struct nfsd4_compoundargs *argp, u32 *bmval,
276 int expected_len, len = 0; 276 int expected_len, len = 0;
277 u32 dummy32; 277 u32 dummy32;
278 char *buf; 278 char *buf;
279 int host_err;
280 279
281 DECODE_HEAD; 280 DECODE_HEAD;
282 iattr->ia_valid = 0; 281 iattr->ia_valid = 0;
@@ -303,10 +302,9 @@ nfsd4_decode_fattr(struct nfsd4_compoundargs *argp, u32 *bmval,
303 return nfserr_resource; 302 return nfserr_resource;
304 303
305 *acl = nfs4_acl_new(nace); 304 *acl = nfs4_acl_new(nace);
306 if (*acl == NULL) { 305 if (*acl == NULL)
307 host_err = -ENOMEM; 306 return nfserr_jukebox;
308 goto out_nfserr; 307
309 }
310 defer_free(argp, kfree, *acl); 308 defer_free(argp, kfree, *acl);
311 309
312 (*acl)->naces = nace; 310 (*acl)->naces = nace;
@@ -444,10 +442,6 @@ nfsd4_decode_fattr(struct nfsd4_compoundargs *argp, u32 *bmval,
444 goto xdr_error; 442 goto xdr_error;
445 443
446 DECODE_TAIL; 444 DECODE_TAIL;
447
448out_nfserr:
449 status = nfserrno(host_err);
450 goto out;
451} 445}
452 446
453static __be32 447static __be32