aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfsd/nfs4xdr.c
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@redhat.com>2011-01-04 17:53:52 -0500
committerJ. Bruce Fields <bfields@redhat.com>2011-01-04 18:22:11 -0500
commit3c726023402a2f3b28f49b9d90ebf9e71151157d (patch)
tree434ee06a662815327c8bd34aaf7b5258994dc033 /fs/nfsd/nfs4xdr.c
parent775a1905e1e042e830eae31e70efec9387eb3e1d (diff)
nfsd4: return nfs errno from name_to_id functions
This avoids the need for the confusing ESRCH mapping. Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd/nfs4xdr.c')
-rw-r--r--fs/nfsd/nfs4xdr.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index 2a0814d0ab1a..ca3786905dec 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -289,17 +289,17 @@ nfsd4_decode_fattr(struct nfsd4_compoundargs *argp, u32 *bmval,
289 len += XDR_QUADLEN(dummy32) << 2; 289 len += XDR_QUADLEN(dummy32) << 2;
290 READMEM(buf, dummy32); 290 READMEM(buf, dummy32);
291 ace->whotype = nfs4_acl_get_whotype(buf, dummy32); 291 ace->whotype = nfs4_acl_get_whotype(buf, dummy32);
292 host_err = 0; 292 status = nfs_ok;
293 if (ace->whotype != NFS4_ACL_WHO_NAMED) 293 if (ace->whotype != NFS4_ACL_WHO_NAMED)
294 ace->who = 0; 294 ace->who = 0;
295 else if (ace->flag & NFS4_ACE_IDENTIFIER_GROUP) 295 else if (ace->flag & NFS4_ACE_IDENTIFIER_GROUP)
296 host_err = nfsd_map_name_to_gid(argp->rqstp, 296 status = nfsd_map_name_to_gid(argp->rqstp,
297 buf, dummy32, &ace->who); 297 buf, dummy32, &ace->who);
298 else 298 else
299 host_err = nfsd_map_name_to_uid(argp->rqstp, 299 status = nfsd_map_name_to_uid(argp->rqstp,
300 buf, dummy32, &ace->who); 300 buf, dummy32, &ace->who);
301 if (host_err) 301 if (status)
302 goto out_nfserr; 302 return status;
303 } 303 }
304 } else 304 } else
305 *acl = NULL; 305 *acl = NULL;