- merge revision 1.10

date: 2005/06/07 18:09:28;  author: mlhuang;  state: Exp;  lines: +2 -2
- fix 2.6.10 merge regression
- apply patch to enable legacy ioctl() programs such as 0.30 stable
  util-vserver showattr/setattr to set the immulink and barrier
  high bits
- this is patch-2.6.9-final-vs1.9.3-rc3-legacyimmulinkioctl.patch

From: Sam Vilain <sam@vilain.net>
Re: [Vserver] [PATCH] immulink ioctl is not available on vs1.9.3-rc2,  even with CONFIG_VSERVER_LEGACY
To: vserver@list.linux-vserver.org
Date: 10/18/04 12:48 am

diff --git a/include/linux/ext3_fs.h b/include/linux/ext3_fs.h
index f2d1cd9..818516b 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           0x0803DFFF /* User visible flags */
-#define EXT3_FL_USER_MODIFIABLE                0x080380FF /* User modifiable flags */
+#define EXT3_FL_USER_VISIBLE           0x0C03DFFF /* User visible flags */
+#define EXT3_FL_USER_MODIFIABLE                0x0C0380FF /* User modifiable flags */
 #else
 #define EXT3_FL_USER_VISIBLE           0x0003DFFF /* User visible flags */
 #define EXT3_FL_USER_MODIFIABLE                0x000380FF /* User modifiable flags */