From: Mark Huang Date: Tue, 30 Nov 2004 16:45:28 +0000 (+0000) Subject: - merge revision 1.6 X-Git-Tag: after-CAN_2004_1016_1017_1068-merge~10 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=a47bbfb77a7003242cb8a80271bc5984e1def6bd;p=linux-2.6.git - merge revision 1.6 date: 2004/11/23 15:11:39; author: mlhuang; state: Exp; lines: +5 -0 - 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 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 100fba908..7fe32d0be 100644 --- a/include/linux/ext3_fs.h +++ b/include/linux/ext3_fs.h @@ -189,8 +189,13 @@ struct ext3_group_desc #define EXT3_IUNLINK_FL 0x08000000 /* Immutable unlink */ #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 */ +#else #define EXT3_FL_USER_VISIBLE 0x0003DFFF /* User visible flags */ #define EXT3_FL_USER_MODIFIABLE 0x000380FF /* User modifiable flags */ +#endif /* * Inode dynamic state flags