This commit was manufactured by cvs2svn to create tag

'before-fedora-2_6_10-1_771_FC2-merge'.

diff --git a/fs/posix_acl.c b/fs/posix_acl.c
index 9c67690..97fbb86 100644 (file)
--- a/fs/posix_acl.c
+++ b/fs/posix_acl.c
@@ -215,10 +215,6 @@ posix_acl_permission(struct inode *inode, const struct posix_acl *acl, int want)
        const struct posix_acl_entry *pa, *pe, *mask_obj;
        int found = 0;
 
-       /* Prevent vservers from escaping chroot() barriers */
-       if (IS_BARRIER(inode) && !vx_check(0, VX_ADMIN))
-               return -EACCES;
-
        FOREACH_ACL_ENTRY(pa, acl, pe) {
                 switch(pa->e_tag) {
                         case ACL_USER_OBJ:

diff --git a/include/linux/ext2_fs.h b/include/linux/ext2_fs.h
index 12788c8..a985802 100644 (file)
--- a/include/linux/ext2_fs.h
+++ b/include/linux/ext2_fs.h
@@ -197,8 +197,8 @@ struct ext2_group_desc
 #define EXT2_RESERVED_FL               0x80000000 /* reserved for ext2 lib */
 
 #ifdef CONFIG_VSERVER_LEGACY
-#define EXT2_FL_USER_VISIBLE           0x0C03DFFF /* User visible flags */
-#define EXT2_FL_USER_MODIFIABLE                0x0C0380FF /* User modifiable flags */
+#define EXT2_FL_USER_VISIBLE           0x0803DFFF /* User visible flags */
+#define EXT2_FL_USER_MODIFIABLE                0x080380FF /* User modifiable flags */
 #else
 #define EXT2_FL_USER_VISIBLE           0x0003DFFF /* User visible flags */
 #define EXT2_FL_USER_MODIFIABLE                0x000380FF /* User modifiable flags */

diff --git a/include/linux/ext3_fs.h b/include/linux/ext3_fs.h
index 818516b..f2d1cd9 100644 (file)
--- a/include/linux/ext3_fs.h
+++ b/include/linux/ext3_fs.h
@@ -190,8 +190,8 @@ struct ext3_group_desc
 #define EXT3_RESERVED_FL               0x80000000 /* reserved for ext3 lib */
 
 #ifdef CONFIG_VSERVER_LEGACY
-#define EXT3_FL_USER_VISIBLE           0x0C03DFFF /* User visible flags */
-#define EXT3_FL_USER_MODIFIABLE                0x0C0380FF /* User modifiable flags */
+#define EXT3_FL_USER_VISIBLE           0x0803DFFF /* User visible flags */
+#define EXT3_FL_USER_MODIFIABLE                0x080380FF /* User modifiable flags */
 #else
 #define EXT3_FL_USER_VISIBLE           0x0003DFFF /* User visible flags */
 #define EXT3_FL_USER_MODIFIABLE                0x000380FF /* User modifiable flags */