From 7407d6f5a239f764b5fea5171c878b6328ba34b6 Mon Sep 17 00:00:00 2001 From: shaver Date: Fri, 11 Jul 2003 10:20:21 +0000 Subject: [PATCH] b_devel -> b_unify merge. Doesn't build with vanilla-2.4.20 at least, but has the Lustre bits (especially mtime) merged correctly as far as we can tell. Some of the dentry_operations bits don't line up well, though the 2.4.20 patch is very similar to the 2.4.18-chaos65 one in the relevant areas (dcache.h). Might just be some more bits to bring over from b_ad? --- lustre/kernel_patches/patches/iopen-2.4.20.patch | 46 ++++++++++++------------ 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/lustre/kernel_patches/patches/iopen-2.4.20.patch b/lustre/kernel_patches/patches/iopen-2.4.20.patch index 3038cc87..ec48814 100644 --- a/lustre/kernel_patches/patches/iopen-2.4.20.patch +++ b/lustre/kernel_patches/patches/iopen-2.4.20.patch @@ -1,15 +1,15 @@ 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 | 13 +- + fs/ext3/iopen.c | 259 +++++++++++++++++++++++++++++++++++++ + fs/ext3/iopen.h | 13 + + fs/ext3/namei.c | 13 + fs/ext3/super.c | 11 + include/linux/ext3_fs.h | 2 - 8 files changed, 301 insertions(+), 2 deletions(-) + 8 files changed, 318 insertions(+), 2 deletions(-) ---- linux-2.4.20/Documentation/filesystems/ext2.txt~iopen 2001-07-11 16:44:45.000000000 -0600 -+++ linux-2.4.20-braam/Documentation/filesystems/ext2.txt 2003-05-17 14:06:00.000000000 -0600 +--- linux/Documentation/filesystems/ext2.txt~iopen-2.4.20 Wed Jul 11 15:44:45 2001 ++++ linux-mmonroe/Documentation/filesystems/ext2.txt Thu Jul 10 12:28:54 2003 @@ -35,6 +35,22 @@ resgid=n The group ID which may use th sb=n Use alternate superblock at this location. @@ -33,8 +33,8 @@ grpquota,noquota,quota,usrquota Quota options are silently ignored by ext2. ---- linux-2.4.20/fs/ext3/Makefile~iopen 2003-05-17 14:05:57.000000000 -0600 -+++ linux-2.4.20-braam/fs/ext3/Makefile 2003-05-17 14:06:00.000000000 -0600 +--- linux/fs/ext3/Makefile~iopen-2.4.20 Thu Jul 10 12:28:44 2003 ++++ linux-mmonroe/fs/ext3/Makefile Thu Jul 10 12:28:54 2003 @@ -11,7 +11,7 @@ O_TARGET := ext3.o export-objs := ext3-exports.o @@ -44,8 +44,8 @@ ioctl.o namei.o super.o symlink.o hash.o ext3-exports.o obj-m := $(O_TARGET) ---- linux-2.4.20/fs/ext3/inode.c~iopen 2003-05-17 14:06:00.000000000 -0600 -+++ linux-2.4.20-braam/fs/ext3/inode.c 2003-05-17 14:06:00.000000000 -0600 +--- linux/fs/ext3/inode.c~iopen-2.4.20 Thu Jul 10 12:28:46 2003 ++++ linux-mmonroe/fs/ext3/inode.c Thu Jul 10 12:28:54 2003 @@ -31,6 +31,7 @@ #include #include @@ -54,7 +54,7 @@ /* * SEARCH_FROM_ZERO forces each block allocation to search from the start -@@ -2137,6 +2138,9 @@ void ext3_read_inode(struct inode * inod +@@ -2253,6 +2254,9 @@ void ext3_read_inode(struct inode * inod struct buffer_head *bh; int block; @@ -64,8 +64,8 @@ if(ext3_get_inode_loc(inode, &iloc)) goto bad_inode; bh = iloc.bh; ---- /dev/null 2003-01-30 03:24:37.000000000 -0700 -+++ linux-2.4.20-braam/fs/ext3/iopen.c 2003-05-17 22:18:55.000000000 -0600 +--- /dev/null Tue Jan 28 04:00:01 2003 ++++ linux-mmonroe/fs/ext3/iopen.c Thu Jul 10 12:28:54 2003 @@ -0,0 +1,259 @@ +/* + * linux/fs/ext3/iopen.c @@ -326,8 +326,8 @@ + + return 1; +} ---- /dev/null 2003-01-30 03:24:37.000000000 -0700 -+++ linux-2.4.20-braam/fs/ext3/iopen.h 2003-05-17 14:06:00.000000000 -0600 +--- /dev/null Tue Jan 28 04:00:01 2003 ++++ linux-mmonroe/fs/ext3/iopen.h Thu Jul 10 12:28:54 2003 @@ -0,0 +1,13 @@ +/* + * iopen.h @@ -342,8 +342,8 @@ + +extern int ext3_check_for_iopen(struct inode *dir, struct dentry *dentry); +extern int ext3_iopen_get_inode(struct inode *inode); ---- linux-2.4.20/fs/ext3/namei.c~iopen 2003-05-17 14:05:59.000000000 -0600 -+++ linux-2.4.20-braam/fs/ext3/namei.c 2003-05-17 22:23:08.000000000 -0600 +--- linux/fs/ext3/namei.c~iopen-2.4.20 Thu Jul 10 12:28:46 2003 ++++ linux-mmonroe/fs/ext3/namei.c Thu Jul 10 12:28:54 2003 @@ -35,7 +35,7 @@ #include #include @@ -388,9 +388,9 @@ d_add(dentry, inode); return NULL; } ---- linux-2.4.20/fs/ext3/super.c~iopen 2003-05-17 14:05:59.000000000 -0600 -+++ linux-2.4.20-braam/fs/ext3/super.c 2003-05-17 14:06:00.000000000 -0600 -@@ -820,6 +820,17 @@ static int parse_options (char * options +--- linux/fs/ext3/super.c~iopen-2.4.20 Thu Jul 10 12:28:45 2003 ++++ linux-mmonroe/fs/ext3/super.c Thu Jul 10 12:28:54 2003 +@@ -835,6 +835,17 @@ static int parse_options (char * options || !strcmp (this_char, "quota") || !strcmp (this_char, "usrquota")) /* Don't do anything ;-) */ ; @@ -408,15 +408,15 @@ else if (!strcmp (this_char, "journal")) { /* @@@ FIXME */ /* Eventually we will want to be able to create ---- linux-2.4.20/include/linux/ext3_fs.h~iopen 2003-05-17 14:05:59.000000000 -0600 -+++ linux-2.4.20-braam/include/linux/ext3_fs.h 2003-05-17 14:06:29.000000000 -0600 +--- linux/include/linux/ext3_fs.h~iopen-2.4.20 Thu Jul 10 12:28:46 2003 ++++ linux-mmonroe/include/linux/ext3_fs.h Thu Jul 10 12:30:12 2003 @@ -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