X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fkernel_patches%2Fpatches%2Fiopen-2.6-vanilla.patch;fp=lustre%2Fkernel_patches%2Fpatches%2Fiopen-2.6.3-mm4.patch;h=597cb89b66e45c70357c2ff2192e92995582a3eb;hb=2dc9c16e770415d56839e1996015fec5fab93f29;hp=550032079343446defb714908be4b846612fc8f8;hpb=401deb5075f9ab7f6c8c1831c56a84b0134e923c;p=fs%2Flustre-release.git diff --git a/lustre/kernel_patches/patches/iopen-2.6.3-mm4.patch b/lustre/kernel_patches/patches/iopen-2.6-vanilla.patch similarity index 77% rename from lustre/kernel_patches/patches/iopen-2.6.3-mm4.patch rename to lustre/kernel_patches/patches/iopen-2.6-vanilla.patch index 5500320..597cb89 100644 --- a/lustre/kernel_patches/patches/iopen-2.6.3-mm4.patch +++ b/lustre/kernel_patches/patches/iopen-2.6-vanilla.patch @@ -7,37 +7,10 @@ include/linux/ext3_fs.h | 2 7 files changed, 304 insertions(+), 1 deletion(-) -Index: linux-2.6.3-mm4/Documentation/filesystems/ext2.txt +Index: linux-2.6.4-51.1/fs/ext3/inode.c =================================================================== ---- linux-2.6.3-mm4.orig/Documentation/filesystems/ext2.txt 2004-01-09 14:59:18.000000000 +0800 -+++ linux-2.6.3-mm4/Documentation/filesystems/ext2.txt 2004-03-08 14:58:44.431196112 +0800 -@@ -35,6 +35,22 @@ - - sb=n Use alternate superblock at this location. - -+iopen Makes an invisible pseudo-directory called -+ __iopen__ available in the root directory -+ of the filesystem. Allows open-by-inode- -+ number. i.e., inode 3145 can be accessed -+ via /mntpt/__iopen__/3145 -+ -+iopen_nopriv This option makes the iopen directory be -+ world-readable. This may be safer since it -+ allows daemons to run as an unprivileged user, -+ however it significantly changes the security -+ model of a Unix filesystem, since previously -+ all files under a mode 700 directory were not -+ generally avilable even if the -+ permissions on the file itself is -+ world-readable. -+ - grpquota,noquota,quota,usrquota Quota options are silently ignored by ext2. - - -Index: linux-2.6.3-mm4/fs/ext3/inode.c -=================================================================== ---- linux-2.6.3-mm4.orig/fs/ext3/inode.c 2004-03-08 14:57:54.969715400 +0800 -+++ linux-2.6.3-mm4/fs/ext3/inode.c 2004-03-08 14:58:44.504185016 +0800 +--- linux-2.6.4-51.1.orig/fs/ext3/inode.c 2004-04-06 00:31:14.000000000 -0400 ++++ linux-2.6.4-51.1/fs/ext3/inode.c 2004-04-06 00:31:24.000000000 -0400 @@ -37,6 +37,7 @@ #include #include @@ -55,11 +28,13 @@ Index: linux-2.6.3-mm4/fs/ext3/inode.c if (ext3_get_inode_loc(inode, &iloc, 0)) goto bad_inode; bh = iloc.bh; -Index: linux-2.6.3-mm4/fs/ext3/iopen.c +Index: linux-2.6.4-51.1/fs/ext3/iopen.c =================================================================== ---- linux-2.6.3-mm4.orig/fs/ext3/iopen.c 2004-03-08 14:58:44.413198848 +0800 -+++ linux-2.6.3-mm4/fs/ext3/iopen.c 2004-03-08 14:58:44.576174072 +0800 -@@ -0,0 +1,218 @@ +--- linux-2.6.4-51.1.orig/fs/ext3/iopen.c 2004-04-06 00:31:24.000000000 -0400 ++++ linux-2.6.4-51.1/fs/ext3/iopen.c 2004-04-06 00:31:24.000000000 -0400 +@@ -0,0 +1,223 @@ ++ ++ +/* + * linux/fs/ext3/iopen.c + * @@ -88,8 +63,7 @@ Index: linux-2.6.3-mm4/fs/ext3/iopen.c +/* + * This implements looking up an inode by number. + */ -+static struct dentry *iopen_lookup(struct inode *dir, struct dentry *dentry, -+ struct nameidata *nd) ++static struct dentry *iopen_lookup(struct inode * dir, struct dentry *dentry, struct nameidata *nd) +{ + struct inode * inode; + unsigned long ino; @@ -110,7 +84,10 @@ Index: linux-2.6.3-mm4/fs/ext3/iopen.c + else + ino = simple_strtoul(buf, 0, 0); + -+ if ((ino != EXT3_ROOT_INO && ino < EXT3_FIRST_INO(dir->i_sb)) || ++ if ((ino != EXT3_ROOT_INO && ++ //ino != EXT3_ACL_IDX_INO && ++ //ino != EXT3_ACL_DATA_INO && ++ ino < EXT3_FIRST_INO(dir->i_sb)) || + ino > le32_to_cpu(EXT3_SB(dir->i_sb)->s_es->s_inodes_count)) + return ERR_PTR(-ENOENT); + @@ -177,6 +154,7 @@ Index: linux-2.6.3-mm4/fs/ext3/iopen.c + assert(list_empty(&de->d_subdirs)); + assert(list_empty(&de->d_alias)); + ++ + list_for_each(lp, &inode->i_dentry) { + tmp = list_entry(lp, struct dentry, d_alias); + if (tmp->d_flags & DCACHE_DISCONNECTED) { @@ -278,10 +256,10 @@ Index: linux-2.6.3-mm4/fs/ext3/iopen.c + + return 1; +} -Index: linux-2.6.3-mm4/fs/ext3/iopen.h +Index: linux-2.6.4-51.1/fs/ext3/iopen.h =================================================================== ---- linux-2.6.3-mm4.orig/fs/ext3/iopen.h 2004-03-08 14:58:44.413198848 +0800 -+++ linux-2.6.3-mm4/fs/ext3/iopen.h 2004-03-08 14:58:44.577173920 +0800 +--- linux-2.6.4-51.1.orig/fs/ext3/iopen.h 2004-04-06 00:31:24.000000000 -0400 ++++ linux-2.6.4-51.1/fs/ext3/iopen.h 2004-04-06 00:31:24.000000000 -0400 @@ -0,0 +1,15 @@ +/* + * iopen.h @@ -298,10 +276,10 @@ Index: linux-2.6.3-mm4/fs/ext3/iopen.h +extern int ext3_iopen_get_inode(struct inode * inode); + + -Index: linux-2.6.3-mm4/fs/ext3/namei.c +Index: linux-2.6.4-51.1/fs/ext3/namei.c =================================================================== ---- linux-2.6.3-mm4.orig/fs/ext3/namei.c 2004-03-08 14:57:52.978018184 +0800 -+++ linux-2.6.3-mm4/fs/ext3/namei.c 2004-03-08 14:58:44.648163128 +0800 +--- linux-2.6.4-51.1.orig/fs/ext3/namei.c 2004-04-06 00:31:11.000000000 -0400 ++++ linux-2.6.4-51.1/fs/ext3/namei.c 2004-04-06 00:31:24.000000000 -0400 @@ -37,6 +37,7 @@ #include #include @@ -321,7 +299,7 @@ Index: linux-2.6.3-mm4/fs/ext3/namei.c struct inode * inode; struct ext3_dir_entry_2 * de; struct buffer_head * bh; -+ struct dentry *alternate = NULL; ++ struct dentry *alternate = NULL; if (dentry->d_name.len > EXT3_NAME_LEN) return ERR_PTR(-ENAMETOOLONG); @@ -347,11 +325,11 @@ Index: linux-2.6.3-mm4/fs/ext3/namei.c d_add(dentry, inode); return NULL; } -Index: linux-2.6.3-mm4/fs/ext3/super.c +Index: linux-2.6.4-51.1/fs/ext3/super.c =================================================================== ---- linux-2.6.3-mm4.orig/fs/ext3/super.c 2004-03-08 14:57:55.049703240 +0800 -+++ linux-2.6.3-mm4/fs/ext3/super.c 2004-03-08 15:03:18.310560120 +0800 -@@ -575,7 +575,7 @@ +--- linux-2.6.4-51.1.orig/fs/ext3/super.c 2004-04-06 00:31:14.000000000 -0400 ++++ linux-2.6.4-51.1/fs/ext3/super.c 2004-04-06 00:31:24.000000000 -0400 +@@ -536,7 +536,7 @@ Opt_abort, Opt_data_journal, Opt_data_ordered, Opt_data_writeback, Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota, Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, @@ -360,7 +338,7 @@ Index: linux-2.6.3-mm4/fs/ext3/super.c }; static match_table_t tokens = { -@@ -620,6 +620,9 @@ +@@ -575,6 +575,9 @@ {Opt_ignore, "noquota"}, {Opt_ignore, "quota"}, {Opt_ignore, "usrquota"}, @@ -370,7 +348,7 @@ Index: linux-2.6.3-mm4/fs/ext3/super.c {Opt_err, NULL} }; -@@ -869,6 +872,18 @@ +@@ -762,6 +765,18 @@ case Opt_abort: set_opt(sbi->s_mount_opt, ABORT); break; @@ -389,23 +367,10 @@ Index: linux-2.6.3-mm4/fs/ext3/super.c case Opt_ignore: break; default: -Index: linux-2.6.3-mm4/fs/ext3/Makefile -=================================================================== ---- linux-2.6.3-mm4.orig/fs/ext3/Makefile 2004-01-09 14:59:08.000000000 +0800 -+++ linux-2.6.3-mm4/fs/ext3/Makefile 2004-03-08 14:58:44.794140936 +0800 -@@ -5,7 +5,7 @@ - obj-$(CONFIG_EXT3_FS) += ext3.o - - ext3-y := balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o \ -- ioctl.o namei.o super.o symlink.o hash.o -+ ioctl.o namei.o super.o symlink.o hash.o iopen.o - - ext3-$(CONFIG_EXT3_FS_XATTR) += xattr.o xattr_user.o xattr_trusted.o - ext3-$(CONFIG_EXT3_FS_POSIX_ACL) += acl.o -Index: linux-2.6.3-mm4/include/linux/ext3_fs.h +Index: linux-2.6.4-51.1/include/linux/ext3_fs.h =================================================================== ---- linux-2.6.3-mm4.orig/include/linux/ext3_fs.h 2004-03-08 14:57:53.057006176 +0800 -+++ linux-2.6.3-mm4/include/linux/ext3_fs.h 2004-03-08 14:58:44.795140784 +0800 +--- linux-2.6.4-51.1.orig/include/linux/ext3_fs.h 2004-04-06 00:31:11.000000000 -0400 ++++ linux-2.6.4-51.1/include/linux/ext3_fs.h 2004-04-06 00:31:24.000000000 -0400 @@ -325,6 +325,8 @@ #define EXT3_MOUNT_NO_UID32 0x2000 /* Disable 32-bit UIDs */ #define EXT3_MOUNT_XATTR_USER 0x4000 /* Extended user attributes */ @@ -415,3 +380,16 @@ Index: linux-2.6.3-mm4/include/linux/ext3_fs.h /* Compatibility, for having both ext2_fs.h and ext3_fs.h included at once */ #ifndef _LINUX_EXT2_FS_H +Index: linux-2.6.4-51.1/fs/ext3/Makefile +=================================================================== +--- linux-2.6.4-51.1.orig/fs/ext3/Makefile 2004-04-06 00:27:21.000000000 -0400 ++++ linux-2.6.4-51.1/fs/ext3/Makefile 2004-04-06 00:31:42.000000000 -0400 +@@ -5,7 +5,7 @@ + obj-$(CONFIG_EXT3_FS) += ext3.o + + ext3-y := balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o \ +- ioctl.o namei.o super.o symlink.o hash.o ++ ioctl.o namei.o super.o symlink.o hash.o iopen.o + + ext3-$(CONFIG_EXT3_FS_XATTR) += xattr.o xattr_user.o xattr_trusted.o + ext3-$(CONFIG_EXT3_FS_POSIX_ACL) += acl.o