summaryrefslogtreecommitdiff
path: root/fs/btrfs/xattr.c
diff options
context:
space:
mode:
authorYan <yanzheng@21cn.com>2008-01-14 13:26:08 -0500
committerChris Mason <chris.mason@oracle.com>2008-09-25 11:03:59 -0400
commit744f52f997b21de2a01931f79cf6c198bf688120 (patch)
tree903f0d91560b139bc7167f424e34664ddb7c0b72 /fs/btrfs/xattr.c
parentb3a0d8d28c607cb2531a68742afc2b967b1f6083 (diff)
Btrfs: Implement ACLs setting and getting
ACLs are stored but not used for permission checks (yet) Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/xattr.c')
-rw-r--r--fs/btrfs/xattr.c16
1 files changed, 4 insertions, 12 deletions
diff --git a/fs/btrfs/xattr.c b/fs/btrfs/xattr.c
index 33caaf5b4b0c..85ac42605f8d 100644
--- a/fs/btrfs/xattr.c
+++ b/fs/btrfs/xattr.c
@@ -141,11 +141,6 @@ ssize_t btrfs_xattr_get(struct inode *inode, int name_index,
if (!handler)
return -EOPNOTSUPP;
-
- /* just in case... */
- if (*attr_name == '\0')
- return -EINVAL;
-
name = get_name(attr_name, name_index);
if (!name)
return -ENOMEM;
@@ -201,14 +196,8 @@ int btrfs_xattr_set(struct inode *inode, int name_index,
struct xattr_handler *handler = btrfs_xattr_handler(name_index);
char *name;
int ret = 0, mod = 0;
-
if (!handler)
return -EOPNOTSUPP;
-
- /* just in case... */
- if (*attr_name == '\0')
- return -EINVAL;
-
name = get_name(attr_name, name_index);
if (!name)
return -ENOMEM;
@@ -454,15 +443,18 @@ static int btrfs_xattr_##name##_get(struct inode *inode, \
const char *name, void *value, \
size_t size) \
{ \
+ if (*name == '\0') \
+ return -EINVAL; \
return btrfs_xattr_get(inode, index, name, value, size); \
} \
static int btrfs_xattr_##name##_set(struct inode *inode, \
const char *name, const void *value,\
size_t size, int flags) \
{ \
+ if (*name == '\0') \
+ return -EINVAL; \
return btrfs_xattr_set(inode, index, name, value, size, flags); \
} \
-
BTRFS_XATTR_SETGET_FUNCS(security, BTRFS_XATTR_INDEX_SECURITY);
BTRFS_XATTR_SETGET_FUNCS(system, BTRFS_XATTR_INDEX_SYSTEM);
BTRFS_XATTR_SETGET_FUNCS(user, BTRFS_XATTR_INDEX_USER);