nfsd4: use list_move in move_to_confirmed

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

diff --git a/fs/reiserfs/xattr_trusted.c b/fs/reiserfs/xattr_trusted.c
index 4376219..5b08aac 100644 (file)
--- a/fs/reiserfs/xattr_trusted.c
+++ b/fs/reiserfs/xattr_trusted.c
@@ -1,4 +1,5 @@
 #include <linux/reiserfs_fs.h>
+#include <linux/capability.h>
 #include <linux/errno.h>
 #include <linux/fs.h>
 #include <linux/pagemap.h>
@@ -6,76 +7,50 @@
 #include <linux/reiserfs_xattr.h>
 #include <asm/uaccess.h>
 
-#define XATTR_TRUSTED_PREFIX "trusted."
-
-static int
-trusted_get (struct inode *inode, const char *name, void *buffer, size_t size)
-{
-    if (strlen(name) < sizeof(XATTR_TRUSTED_PREFIX))
-        return -EINVAL;
-
-    if (!reiserfs_xattrs (inode->i_sb))
-        return -EOPNOTSUPP;
-
-    if (!(capable(CAP_SYS_ADMIN) || is_reiserfs_priv_object(inode)))
-        return -EPERM;
-
-    return reiserfs_xattr_get (inode, name, buffer, size);
-}
-
 static int
-trusted_set (struct inode *inode, const char *name, const void *buffer,
-          size_t size, int flags)
+trusted_get(struct dentry *dentry, const char *name, void *buffer, size_t size,
+           int handler_flags)
 {
-    if (strlen(name) < sizeof(XATTR_TRUSTED_PREFIX))
-        return -EINVAL;
-
-    if (!reiserfs_xattrs (inode->i_sb))
-        return -EOPNOTSUPP;
+       if (strlen(name) < sizeof(XATTR_TRUSTED_PREFIX))
+               return -EINVAL;
 
-    if (!(capable(CAP_SYS_ADMIN) || is_reiserfs_priv_object(inode)))
-        return -EPERM;
+       if (!capable(CAP_SYS_ADMIN) || IS_PRIVATE(dentry->d_inode))
+               return -EPERM;
 
-    return reiserfs_xattr_set (inode, name, buffer, size, flags);
+       return reiserfs_xattr_get(dentry->d_inode, name, buffer, size);
 }
 
 static int
-trusted_del (struct inode *inode, const char *name)
+trusted_set(struct dentry *dentry, const char *name, const void *buffer,
+           size_t size, int flags, int handler_flags)
 {
-    if (strlen(name) < sizeof(XATTR_TRUSTED_PREFIX))
-        return -EINVAL;
+       if (strlen(name) < sizeof(XATTR_TRUSTED_PREFIX))
+               return -EINVAL;
 
-    if (!reiserfs_xattrs (inode->i_sb))
-        return -EOPNOTSUPP;
+       if (!capable(CAP_SYS_ADMIN) || IS_PRIVATE(dentry->d_inode))
+               return -EPERM;
 
-    if (!(capable(CAP_SYS_ADMIN) || is_reiserfs_priv_object(inode)))
-        return -EPERM;
-
-    return 0;
+       return reiserfs_xattr_set(dentry->d_inode, name, buffer, size, flags);
 }
 
-static int
-trusted_list (struct inode *inode, const char *name, int namelen, char *out)
+static size_t trusted_list(struct dentry *dentry, char *list, size_t list_size,
+                          const char *name, size_t name_len, int handler_flags)
 {
-    int len = namelen;
+       const size_t len = name_len + 1;
 
-    if (!reiserfs_xattrs (inode->i_sb))
-        return 0;
+       if (!capable(CAP_SYS_ADMIN) || IS_PRIVATE(dentry->d_inode))
+               return 0;
 
-    if (!(capable(CAP_SYS_ADMIN) || is_reiserfs_priv_object(inode)))
-        return 0;
-
-    if (out)
-        memcpy (out, name, len);
-
-    return len;
+       if (list && len <= list_size) {
+               memcpy(list, name, name_len);
+               list[name_len] = '\0';
+       }
+       return len;
 }
 
-
-struct reiserfs_xattr_handler trusted_handler = {
+struct xattr_handler reiserfs_xattr_trusted_handler = {
        .prefix = XATTR_TRUSTED_PREFIX,
        .get = trusted_get,
        .set = trusted_set,
-       .del = trusted_del,
        .list = trusted_list,
 };