Merge with /home/shaggy/git/linus-clean/

1 files changed, 1 insertions, 4 deletions

diff --git a/fs/ext3/xattr_trusted.c b/fs/ext3/xattr_trusted.c
index f68bfd1cf519..86d91f1186dc 100644
--- a/fs/ext3/xattr_trusted.c
+++ b/fs/ext3/xattr_trusted.c
@@ -7,6 +7,7 @@
 
 #include <linux/module.h>
 #include <linux/string.h>
+#include <linux/capability.h>
 #include <linux/fs.h>
 #include <linux/smp_lock.h>
 #include <linux/ext3_jbd.h>
@@ -39,8 +40,6 @@ ext3_xattr_trusted_get(struct inode *inode, const char *name,
 {
         if (strcmp(name, "") == 0)
                 return -EINVAL;
-        if (!capable(CAP_SYS_ADMIN))
-                return -EPERM;
         return ext3_xattr_get(inode, EXT3_XATTR_INDEX_TRUSTED, name,
                               buffer, size);
 }
@@ -51,8 +50,6 @@ ext3_xattr_trusted_set(struct inode *inode, const char *name,
 {
         if (strcmp(name, "") == 0)
                 return -EINVAL;
-        if (!capable(CAP_SYS_ADMIN))
-                return -EPERM;
         return ext3_xattr_set(inode, EXT3_XATTR_INDEX_TRUSTED, name,
                               value, size, flags);
 }