Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / fs / reiserfs / xattr_trusted.c

diff --git a/fs/reiserfs/xattr_trusted.c b/fs/reiserfs/xattr_trusted.c
index 4376219..024a938 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>
@@ -9,69 +10,67 @@
 #define XATTR_TRUSTED_PREFIX "trusted."
 
 static int
-trusted_get (struct inode *inode, const char *name, void *buffer, size_t size)
+trusted_get(struct inode *inode, const char *name, void *buffer, size_t size)
 {
-    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 (!reiserfs_xattrs(inode->i_sb))
+               return -EOPNOTSUPP;
 
-    if (!(capable(CAP_SYS_ADMIN) || is_reiserfs_priv_object(inode)))
-        return -EPERM;
+       if (!(capable(CAP_SYS_ADMIN) || is_reiserfs_priv_object(inode)))
+               return -EPERM;
 
-    return reiserfs_xattr_get (inode, name, buffer, size);
+       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_set(struct inode *inode, const char *name, const void *buffer,
+           size_t size, int 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 (!reiserfs_xattrs(inode->i_sb))
+               return -EOPNOTSUPP;
 
-    if (!(capable(CAP_SYS_ADMIN) || is_reiserfs_priv_object(inode)))
-        return -EPERM;
+       if (!(capable(CAP_SYS_ADMIN) || is_reiserfs_priv_object(inode)))
+               return -EPERM;
 
-    return reiserfs_xattr_set (inode, name, buffer, size, flags);
+       return reiserfs_xattr_set(inode, name, buffer, size, flags);
 }
 
-static int
-trusted_del (struct inode *inode, const char *name)
+static int trusted_del(struct inode *inode, const char *name)
 {
-    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 (!reiserfs_xattrs(inode->i_sb))
+               return -EOPNOTSUPP;
 
-    if (!(capable(CAP_SYS_ADMIN) || is_reiserfs_priv_object(inode)))
-        return -EPERM;
+       if (!(capable(CAP_SYS_ADMIN) || is_reiserfs_priv_object(inode)))
+               return -EPERM;
 
-    return 0;
+       return 0;
 }
 
 static int
-trusted_list (struct inode *inode, const char *name, int namelen, char *out)
+trusted_list(struct inode *inode, const char *name, int namelen, char *out)
 {
-    int len = namelen;
+       int len = namelen;
 
-    if (!reiserfs_xattrs (inode->i_sb))
-        return 0;
+       if (!reiserfs_xattrs(inode->i_sb))
+               return 0;
 
-    if (!(capable(CAP_SYS_ADMIN) || is_reiserfs_priv_object(inode)))
-        return 0;
+       if (!(capable(CAP_SYS_ADMIN) || is_reiserfs_priv_object(inode)))
+               return 0;
 
-    if (out)
-        memcpy (out, name, len);
+       if (out)
+               memcpy(out, name, len);
 
-    return len;
+       return len;
 }
 
-
 struct reiserfs_xattr_handler trusted_handler = {
        .prefix = XATTR_TRUSTED_PREFIX,
        .get = trusted_get,