diff options
Diffstat (limited to 'fs/nfs/nfs3acl.c')
| -rw-r--r-- | fs/nfs/nfs3acl.c | 5 | 
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/nfs/nfs3acl.c b/fs/nfs/nfs3acl.c index d0fec260132a..24c6898159cc 100644 --- a/fs/nfs/nfs3acl.c +++ b/fs/nfs/nfs3acl.c @@ -129,7 +129,10 @@ static int __nfs3_proc_setacls(struct inode *inode, struct posix_acl *acl,  		.rpc_argp	= &args,  		.rpc_resp	= &fattr,  	}; -	int status; +	int status = 0; + +	if (acl == NULL && (!S_ISDIR(inode->i_mode) || dfacl == NULL)) +		goto out;  	status = -EOPNOTSUPP;  	if (!nfs_server_capable(inode, NFS_CAP_ACLS))  |