nfsd: move most of nfsfh.h to fs/nfsd

[safe/jmp/linux-2.6] / fs / reiserfs / xattr_user.c

diff --git a/fs/reiserfs/xattr_user.c b/fs/reiserfs/xattr_user.c
index 0772806..e3238dc 100644 (file)
--- a/fs/reiserfs/xattr_user.c
+++ b/fs/reiserfs/xattr_user.c
@@ -6,94 +6,46 @@
 #include <linux/reiserfs_xattr.h>
 #include <asm/uaccess.h>
 
-#ifdef CONFIG_REISERFS_FS_POSIX_ACL
-# include <linux/reiserfs_acl.h>
-#endif
-
-#define XATTR_USER_PREFIX "user."
-
 static int
-user_get (struct inode *inode, const char *name, void *buffer, size_t size)
+user_get(struct inode *inode, const char *name, void *buffer, size_t size)
 {
 
-    int error;
-
-    if (strlen(name) < sizeof(XATTR_USER_PREFIX))
-        return -EINVAL;
-
-    if (!reiserfs_xattrs_user (inode->i_sb))
-        return -EOPNOTSUPP;
-
-    error = reiserfs_permission_locked (inode, MAY_READ, NULL);
-    if (error)
-        return error;
-
-    return reiserfs_xattr_get (inode, name, buffer, size);
+       if (strlen(name) < sizeof(XATTR_USER_PREFIX))
+               return -EINVAL;
+       if (!reiserfs_xattrs_user(inode->i_sb))
+               return -EOPNOTSUPP;
+       return reiserfs_xattr_get(inode, name, buffer, size);
 }
 
 static int
-user_set (struct inode *inode, const char *name, const void *buffer,
-          size_t size, int flags)
+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;
 
-    int error;
-
-    if (strlen(name) < sizeof(XATTR_USER_PREFIX))
-        return -EINVAL;
-
-    if (!reiserfs_xattrs_user (inode->i_sb))
-        return -EOPNOTSUPP;
-
-    if (!S_ISREG (inode->i_mode) &&
-        (!S_ISDIR (inode->i_mode) || inode->i_mode & S_ISVTX))
-        return -EPERM;
-
-    error = reiserfs_permission_locked (inode, MAY_WRITE, NULL);
-    if (error)
-        return error;
-
-    return reiserfs_xattr_set (inode, name, buffer, size, flags);
+       if (!reiserfs_xattrs_user(inode->i_sb))
+               return -EOPNOTSUPP;
+       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)
 {
-    int error;
-
-    if (strlen(name) < sizeof(XATTR_USER_PREFIX))
-        return -EINVAL;
-
-    if (!reiserfs_xattrs_user (inode->i_sb))
-        return -EOPNOTSUPP;
-
-    if (!S_ISREG (inode->i_mode) &&
-        (!S_ISDIR (inode->i_mode) || inode->i_mode & S_ISVTX))
-        return -EPERM;
-
-    error = reiserfs_permission_locked (inode, MAY_WRITE, NULL);
-    if (error)
-        return error;
-
-    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);
-
-    return len;
+       const size_t len = name_len + 1;
+
+       if (!reiserfs_xattrs_user(inode->i_sb))
+               return 0;
+       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,
 };