diff options
Diffstat (limited to 'fs/btrfs/acl.c')
| -rw-r--r-- | fs/btrfs/acl.c | 5 | 
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/btrfs/acl.c b/fs/btrfs/acl.c index 5d505aaa72f..44ea5b92e1b 100644 --- a/fs/btrfs/acl.c +++ b/fs/btrfs/acl.c @@ -178,12 +178,13 @@ static int btrfs_xattr_acl_set(struct dentry *dentry, const char *name,  	if (value) {  		acl = posix_acl_from_xattr(value, size); +		if (IS_ERR(acl)) +			return PTR_ERR(acl); +  		if (acl) {  			ret = posix_acl_valid(acl);  			if (ret)  				goto out; -		} else if (IS_ERR(acl)) { -			return PTR_ERR(acl);  		}  	}  |