From: Christoph Hellwig remove checks now in the VFS Signed-off-by: Christoph Hellwig Signed-off-by: Andrew Morton --- fs/ext2/xattr.c | 4 ---- fs/ext2/xattr_trusted.c | 4 ---- fs/ext2/xattr_user.c | 10 ---------- 3 files changed, 18 deletions(-) diff -puN fs/ext2/xattr.c~remove-ext2-xattr-permission-checks fs/ext2/xattr.c --- devel/fs/ext2/xattr.c~remove-ext2-xattr-permission-checks 2005-10-31 21:10:37.000000000 -0800 +++ devel-akpm/fs/ext2/xattr.c 2005-10-31 21:10:37.000000000 -0800 @@ -389,10 +389,6 @@ ext2_xattr_set(struct inode *inode, int ea_idebug(inode, "name=%d.%s, value=%p, value_len=%ld", name_index, name, value, (long)value_len); - if (IS_RDONLY(inode)) - return -EROFS; - if (IS_IMMUTABLE(inode) || IS_APPEND(inode)) - return -EPERM; if (value == NULL) value_len = 0; if (name == NULL) diff -puN fs/ext2/xattr_trusted.c~remove-ext2-xattr-permission-checks fs/ext2/xattr_trusted.c --- devel/fs/ext2/xattr_trusted.c~remove-ext2-xattr-permission-checks 2005-10-31 21:10:37.000000000 -0800 +++ devel-akpm/fs/ext2/xattr_trusted.c 2005-10-31 21:10:37.000000000 -0800 @@ -38,8 +38,6 @@ ext2_xattr_trusted_get(struct inode *ino { if (strcmp(name, "") == 0) return -EINVAL; - if (!capable(CAP_SYS_ADMIN)) - return -EPERM; return ext2_xattr_get(inode, EXT2_XATTR_INDEX_TRUSTED, name, buffer, size); } @@ -50,8 +48,6 @@ ext2_xattr_trusted_set(struct inode *ino { if (strcmp(name, "") == 0) return -EINVAL; - if (!capable(CAP_SYS_ADMIN)) - return -EPERM; return ext2_xattr_set(inode, EXT2_XATTR_INDEX_TRUSTED, name, value, size, flags); } diff -puN fs/ext2/xattr_user.c~remove-ext2-xattr-permission-checks fs/ext2/xattr_user.c --- devel/fs/ext2/xattr_user.c~remove-ext2-xattr-permission-checks 2005-10-31 21:10:37.000000000 -0800 +++ devel-akpm/fs/ext2/xattr_user.c 2005-10-31 21:10:37.000000000 -0800 @@ -41,10 +41,6 @@ ext2_xattr_user_get(struct inode *inode, return -EINVAL; if (!test_opt(inode->i_sb, XATTR_USER)) return -EOPNOTSUPP; - error = permission(inode, MAY_READ, NULL); - if (error) - return error; - return ext2_xattr_get(inode, EXT2_XATTR_INDEX_USER, name, buffer, size); } @@ -58,12 +54,6 @@ ext2_xattr_user_set(struct inode *inode, return -EINVAL; if (!test_opt(inode->i_sb, XATTR_USER)) return -EOPNOTSUPP; - if ( !S_ISREG(inode->i_mode) && - (!S_ISDIR(inode->i_mode) || inode->i_mode & S_ISVTX)) - return -EPERM; - error = permission(inode, MAY_WRITE, NULL); - if (error) - return error; return ext2_xattr_set(inode, EXT2_XATTR_INDEX_USER, name, value, size, flags); _