Commit 01d53a88 authored by Jeff Layton's avatar Jeff Layton Committed by Chuck Lever
Browse files

nfsd: return error if nfs4_setacl fails 



With the addition of POSIX ACLs to struct nfsd_attrs, we no longer
return an error if setting the ACL fails. Ensure we return the na_aclerr
error on SETATTR if there is one.

Fixes: c0cbe707 ("NFSD: add posix ACLs to struct nfsd_attrs")
Cc: Neil Brown <neilb@suse.de>
Reported-by: default avatarYongcheng Yang <yoyang@redhat.com>
Signed-off-by: default avatarJeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent 18ebd35b

fs/nfsd/nfs4proc.c

+2 −0
Original line number Diff line number Diff line
@@ -1135,6 +1135,8 @@ nfsd4_setattr(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, 
				0, (time64_t)0);

	if (!status)

		status = nfserrno(attrs.na_labelerr);

	if (!status)

		status = nfserrno(attrs.na_aclerr);

out:

	nfsd_attrs_free(&attrs);

	fh_drop_write(&cstate->current_fh);