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>
This commit is contained in:
committed by
Linus Torvalds
parent
8ecbe550a1
commit
48b32a3553
@@ -6,10 +6,6 @@
|
||||
#include <linux/reiserfs_xattr.h>
|
||||
#include <asm/uaccess.h>
|
||||
|
||||
#ifdef CONFIG_REISERFS_FS_POSIX_ACL
|
||||
# include <linux/reiserfs_acl.h>
|
||||
#endif
|
||||
|
||||
static int
|
||||
user_get(struct inode *inode, const char *name, void *buffer, size_t size)
|
||||
{
|
||||
@@ -25,7 +21,6 @@ static int
|
||||
user_set(struct inode *inode, const char *name, const void *buffer,
|
||||
size_t size, int flags)
|
||||
{
|
||||
|
||||
if (strlen(name) < sizeof(XATTR_USER_PREFIX))
|
||||
return -EINVAL;
|
||||
|
||||
@@ -34,33 +29,23 @@ user_set(struct inode *inode, const char *name, const void *buffer,
|
||||
return reiserfs_xattr_set(inode, name, buffer, size, flags);
|
||||
}
|
||||
|
||||
static int user_del(struct inode *inode, const char *name)
|
||||
static size_t user_list(struct inode *inode, char *list, size_t list_size,
|
||||
const char *name, size_t name_len)
|
||||
{
|
||||
if (strlen(name) < sizeof(XATTR_USER_PREFIX))
|
||||
return -EINVAL;
|
||||
const size_t len = name_len + 1;
|
||||
|
||||
if (!reiserfs_xattrs_user(inode->i_sb))
|
||||
return -EOPNOTSUPP;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int
|
||||
user_list(struct inode *inode, const char *name, int namelen, char *out)
|
||||
{
|
||||
int len = namelen;
|
||||
if (!reiserfs_xattrs_user(inode->i_sb))
|
||||
return 0;
|
||||
|
||||
if (out)
|
||||
memcpy(out, name, len);
|
||||
|
||||
if (list && len <= list_size) {
|
||||
memcpy(list, name, name_len);
|
||||
list[name_len] = '\0';
|
||||
}
|
||||
return len;
|
||||
}
|
||||
|
||||
struct reiserfs_xattr_handler user_handler = {
|
||||
struct xattr_handler reiserfs_xattr_user_handler = {
|
||||
.prefix = XATTR_USER_PREFIX,
|
||||
.get = user_get,
|
||||
.set = user_set,
|
||||
.del = user_del,
|
||||
.list = user_list,
|
||||
};
|
||||
|
Reference in New Issue
Block a user