From b765b03628735a4f5692d51924a99231689cfe50 Mon Sep 17 00:00:00 2001 From: wangdi Date: Wed, 4 Jun 2003 02:56:44 +0000 Subject: [PATCH] fix a flaw in iopen-2.4.19 --- lustre/kernel_patches/patches/iopen-2.4.19.patch | 48 ++++++++++-------------- 1 file changed, 20 insertions(+), 28 deletions(-) diff --git a/lustre/kernel_patches/patches/iopen-2.4.19.patch b/lustre/kernel_patches/patches/iopen-2.4.19.patch index 9e3e94e..2aca3a8 100644 --- a/lustre/kernel_patches/patches/iopen-2.4.19.patch +++ b/lustre/kernel_patches/patches/iopen-2.4.19.patch @@ -1,15 +1,7 @@ - Documentation/filesystems/ext2.txt | 16 ++ - fs/ext3/Makefile | 2 - fs/ext3/inode.c | 4 - fs/ext3/iopen.c | 240 +++++++++++++++++++++++++++++++++++++ - fs/ext3/iopen.h | 15 ++ - fs/ext3/namei.c | 15 ++ - fs/ext3/super.c | 11 + - include/linux/ext3_fs.h | 3 - 8 files changed, 303 insertions(+), 3 deletions(-) + 0 files changed ---- linux-2.4.19-hp3_pnnl1/Documentation/filesystems/ext2.txt~iopen-2.4.19 2001-07-12 06:44:45.000000000 +0800 -+++ linux-2.4.19-hp3_pnnl1-root/Documentation/filesystems/ext2.txt 2003-05-19 14:45:51.000000000 +0800 +--- linux/Documentation/filesystems/ext2.txt~iopen-2.4.19 2001-07-12 06:44:45.000000000 +0800 ++++ linux-root/Documentation/filesystems/ext2.txt 2003-06-04 18:51:48.000000000 +0800 @@ -35,6 +35,22 @@ resgid=n The group ID which may use th sb=n Use alternate superblock at this location. @@ -33,8 +25,8 @@ grpquota,noquota,quota,usrquota Quota options are silently ignored by ext2. ---- linux-2.4.19-hp3_pnnl1/fs/ext3/Makefile~iopen-2.4.19 2003-05-19 14:36:42.000000000 +0800 -+++ linux-2.4.19-hp3_pnnl1-root/fs/ext3/Makefile 2003-05-19 14:46:34.000000000 +0800 +--- linux/fs/ext3/Makefile~iopen-2.4.19 2003-06-04 18:17:54.000000000 +0800 ++++ linux-root/fs/ext3/Makefile 2003-06-04 18:51:48.000000000 +0800 @@ -11,7 +11,7 @@ O_TARGET := ext3.o export-objs := super.o inode.o @@ -44,8 +36,8 @@ ioctl.o namei.o super.o symlink.o hash.o obj-m := $(O_TARGET) ---- linux-2.4.19-hp3_pnnl1/fs/ext3/inode.c~iopen-2.4.19 2003-05-19 14:36:50.000000000 +0800 -+++ linux-2.4.19-hp3_pnnl1-root/fs/ext3/inode.c 2003-05-19 14:45:51.000000000 +0800 +--- linux/fs/ext3/inode.c~iopen-2.4.19 2003-06-04 18:28:12.000000000 +0800 ++++ linux-root/fs/ext3/inode.c 2003-06-04 18:51:48.000000000 +0800 @@ -31,6 +31,7 @@ #include #include @@ -64,8 +56,8 @@ if(ext3_get_inode_loc(inode, &iloc)) goto bad_inode; bh = iloc.bh; ---- /dev/null 2003-01-30 18:24:37.000000000 +0800 -+++ linux-2.4.19-hp3_pnnl1-root/fs/ext3/iopen.c 2003-05-19 14:45:51.000000000 +0800 +--- /dev/null 2002-08-31 07:31:37.000000000 +0800 ++++ linux-root/fs/ext3/iopen.c 2003-06-04 18:51:48.000000000 +0800 @@ -0,0 +1,240 @@ + + @@ -307,8 +299,8 @@ + + return 1; +} ---- /dev/null 2003-01-30 18:24:37.000000000 +0800 -+++ linux-2.4.19-hp3_pnnl1-root/fs/ext3/iopen.h 2003-05-19 14:45:51.000000000 +0800 +--- /dev/null 2002-08-31 07:31:37.000000000 +0800 ++++ linux-root/fs/ext3/iopen.h 2003-06-04 18:51:48.000000000 +0800 @@ -0,0 +1,15 @@ +/* + * iopen.h @@ -325,8 +317,8 @@ +extern int ext3_iopen_get_inode(struct inode * inode); + + ---- linux-2.4.19-hp3_pnnl1/fs/ext3/namei.c~iopen-2.4.19 2003-05-19 14:36:47.000000000 +0800 -+++ linux-2.4.19-hp3_pnnl1-root/fs/ext3/namei.c 2003-05-19 14:49:40.000000000 +0800 +--- linux/fs/ext3/namei.c~iopen-2.4.19 2003-06-04 18:28:11.000000000 +0800 ++++ linux-root/fs/ext3/namei.c 2003-06-04 18:51:49.000000000 +0800 @@ -35,7 +35,7 @@ #include #include @@ -371,9 +363,9 @@ d_add(dentry, inode); return NULL; } ---- linux-2.4.19-hp3_pnnl1/fs/ext3/super.c~iopen-2.4.19 2003-05-19 14:36:50.000000000 +0800 -+++ linux-2.4.19-hp3_pnnl1-root/fs/ext3/super.c 2003-05-19 14:45:51.000000000 +0800 -@@ -606,6 +606,17 @@ static int parse_options (char * options +--- linux/fs/ext3/super.c~iopen-2.4.19 2003-06-04 18:28:12.000000000 +0800 ++++ linux-root/fs/ext3/super.c 2003-06-04 18:51:49.000000000 +0800 +@@ -820,6 +820,17 @@ static int parse_options (char * options || !strcmp (this_char, "quota") || !strcmp (this_char, "usrquota")) /* Don't do anything ;-) */ ; @@ -391,15 +383,15 @@ else if (!strcmp (this_char, "journal")) { /* @@@ FIXME */ /* Eventually we will want to be able to create ---- linux-2.4.19-hp3_pnnl1/include/linux/ext3_fs.h~iopen-2.4.19 2003-05-19 14:36:47.000000000 +0800 -+++ linux-2.4.19-hp3_pnnl1-root/include/linux/ext3_fs.h 2003-05-19 14:51:26.000000000 +0800 -@@ -321,6 +321,9 @@ struct ext3_inode { +--- linux/include/linux/ext3_fs.h~iopen-2.4.19 2003-06-04 18:28:11.000000000 +0800 ++++ linux-root/include/linux/ext3_fs.h 2003-06-04 18:52:28.000000000 +0800 +@@ -322,6 +322,8 @@ struct ext3_inode { #define EXT3_MOUNT_UPDATE_JOURNAL 0x1000 /* Update the journal format */ #define EXT3_MOUNT_NO_UID32 0x2000 /* Disable 32-bit UIDs */ #define EXT3_MOUNT_XATTR_USER 0x4000 /* Extended user attributes */ +#define EXT3_MOUNT_IOPEN 0x8000 /* Allow access via iopen */ +#define EXT3_MOUNT_IOPEN_NOPRIV 0x10000 /* Make iopen world-readable */ - #define EXT3_MOUNT_ASYNCDEL 0x20000 /* Delayed deletion */ + #define EXT3_MOUNT_ASYNCDEL 0x20000 /* Delayed deletion */ /* Compatibility, for having both ext2_fs.h and ext3_fs.h included at once */ -- 1.8.3.1