Skip to content

Commit 01d53a8

Browse files
jtlaytonChuck Lever
authored andcommitted
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: c0cbe70 ("NFSD: add posix ACLs to struct nfsd_attrs") Cc: Neil Brown <[email protected]> Reported-by: Yongcheng Yang <[email protected]> Signed-off-by: Jeff Layton <[email protected]> Signed-off-by: Chuck Lever <[email protected]>
1 parent 18ebd35 commit 01d53a8

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

fs/nfsd/nfs4proc.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1135,6 +1135,8 @@ nfsd4_setattr(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
11351135
0, (time64_t)0);
11361136
if (!status)
11371137
status = nfserrno(attrs.na_labelerr);
1138+
if (!status)
1139+
status = nfserrno(attrs.na_aclerr);
11381140
out:
11391141
nfsd_attrs_free(&attrs);
11401142
fh_drop_write(&cstate->current_fh);

0 commit comments

Comments
 (0)