aboutsummaryrefslogtreecommitdiffstats
path: root/fs/reiserfs/xattr_security.c
diff options
context:
space:
mode:
authorJeff Mahoney <jeffm@suse.com>2009-03-30 14:02:38 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-03-30 15:16:38 -0400
commit48b32a3553a54740d236b79a90f20147a25875e3 (patch)
treefaf6807facb5825608469a9e33c9127f90b974df /fs/reiserfs/xattr_security.c
parent8ecbe550a142fe604874afa477ea68986f89b86c (diff)
reiserfs: use generic xattr handlers
Christoph Hellwig had asked me quite some time ago to port the reiserfs xattrs to the generic xattr interface. This patch replaces the reiserfs-specific xattr handling code with the generic struct xattr_handler. However, since reiserfs doesn't split the prefix and name when accessing xattrs, it can't leverage generic_{set,get,list,remove}xattr without needlessly reconstructing the name on the back end. Update 7/26/07: Added missing dput() to deletion path. Update 8/30/07: Added missing mark_inode_dirty when i_mode is used to represent an ACL and no previous ACL existed. Signed-off-by: Jeff Mahoney <jeffm@suse.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/reiserfs/xattr_security.c')
-rw-r--r--fs/reiserfs/xattr_security.c26
1 files changed, 8 insertions, 18 deletions
diff --git a/fs/reiserfs/xattr_security.c b/fs/reiserfs/xattr_security.c
index 1958b361c35d..2aacf1fe69fd 100644
--- a/fs/reiserfs/xattr_security.c
+++ b/fs/reiserfs/xattr_security.c
@@ -31,35 +31,25 @@ security_set(struct inode *inode, const char *name, const void *buffer,
31 return reiserfs_xattr_set(inode, name, buffer, size, flags); 31 return reiserfs_xattr_set(inode, name, buffer, size, flags);
32} 32}
33 33
34static int security_del(struct inode *inode, const char *name) 34static size_t security_list(struct inode *inode, char *list, size_t list_len,
35 const char *name, size_t namelen)
35{ 36{
36 if (strlen(name) < sizeof(XATTR_SECURITY_PREFIX)) 37 const size_t len = namelen + 1;
37 return -EINVAL;
38
39 if (IS_PRIVATE(inode))
40 return -EPERM;
41
42 return 0;
43}
44
45static int
46security_list(struct inode *inode, const char *name, int namelen, char *out)
47{
48 int len = namelen;
49 38
50 if (IS_PRIVATE(inode)) 39 if (IS_PRIVATE(inode))
51 return 0; 40 return 0;
52 41
53 if (out) 42 if (list && len <= list_len) {
54 memcpy(out, name, len); 43 memcpy(list, name, namelen);
44 list[namelen] = '\0';
45 }
55 46
56 return len; 47 return len;
57} 48}
58 49
59struct reiserfs_xattr_handler security_handler = { 50struct xattr_handler reiserfs_xattr_security_handler = {
60 .prefix = XATTR_SECURITY_PREFIX, 51 .prefix = XATTR_SECURITY_PREFIX,
61 .get = security_get, 52 .get = security_get,
62 .set = security_set, 53 .set = security_set,
63 .del = security_del,
64 .list = security_list, 54 .list = security_list,
65}; 55};