diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-01-17 16:26:28 +0100 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-01-17 16:26:28 +0100 |
| commit | 0825788ff27c7145e9d558cb2a26f3837d1f9be5 (patch) | |
| tree | f6bdb892cec8ca0df69c08a3477c89f1542999e5 /fs/ext3/xattr_trusted.c | |
| parent | Merge branch 'upstream' (diff) | |
| parent | [PATCH] libata: add a function to decide if we need iordy (diff) | |
| download | linux-0825788ff27c7145e9d558cb2a26f3837d1f9be5.tar.xz linux-0825788ff27c7145e9d558cb2a26f3837d1f9be5.zip | |
Merge branch 'upstream'
Diffstat (limited to 'fs/ext3/xattr_trusted.c')
| -rw-r--r-- | fs/ext3/xattr_trusted.c | 5 |
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); } |