btrfs/acl: fix btrfs_xattr_acl_set()

PATCH In review Miao Xie 1 participant 1 message Jul 29, 2010 Btrfs file system

lore

Share & tools

lore

Miao Xie

author

2010-07-29 08:27 UTC #0 lore raw

PATCH 2/7 btrfs/acl: fix btrfs_xattr_acl_set()

- cleanup unnecessary code
- add validity check for acl

Signed-off-by Miao Xie <[email protected]>

---
 fs/btrfs/acl.c |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

fs/btrfs/acl.c +6 -5

index 2f4f65a..bb35580 100644
@@ -169,16 +169,17 @@ static int btrfs_xattr_acl_set(struct dentry *dentry, const char *name,
 
 	if (value) {
 		acl = posix_acl_from_xattr(value, size);
-		if (acl == NULL) {
-			value = NULL;
-			size = 0;
-		} else if (IS_ERR(acl)) {
+		if (acl) {
+			ret = posix_acl_valid(acl);
+			if (ret)
+				goto out;
+		} else if (IS_ERR(acl))
 			return PTR_ERR(acl);
-		}
 	}
 
 	ret = btrfs_set_acl(NULL, dentry->d_inode, acl, type);
 
+out:
 	posix_acl_release(acl);
 
 	return ret;

Signature · 1 line

1.7.0.1