lkml.org 
[lkml]   [2010]   [Jul]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH 2/7] btrfs/acl: fix btrfs_xattr_acl_set()
- cleanup unnecessary code
- add validity check for acl

Signed-off-by: Miao Xie <miaox@cn.fujitsu.com>
---
fs/btrfs/acl.c | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/fs/btrfs/acl.c b/fs/btrfs/acl.c
index 2f4f65a..bb35580 100644
--- a/fs/btrfs/acl.c
+++ b/fs/btrfs/acl.c
@@ -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;
--
1.7.0.1

\
 
 \ /
  Last update: 2010-07-29 11:07    [W:0.066 / U:0.624 seconds]
©2003-2014 Jasper Spaans. Advertise on this site