From cdbe3ae4eea37690885d35017b2b0e2ac18f14de Mon Sep 17 00:00:00 2001 From: johann Date: Thu, 3 Apr 2008 13:22:44 +0000 Subject: [PATCH] Branch HEAD b=14594 i=alex.zhuravlev i=sheng.yang add ext3-lookup-dotdot-2.6.9.patch to ldiskfs series. --- ldiskfs/ChangeLog | 6 ++ ldiskfs/kernel_patches/patches/iopen-2.6-fc5.patch | 65 +++++++++++----------- .../patches/iopen-2.6.18-rhel5.patch | 53 +++++++++--------- .../kernel_patches/series/ldiskfs-2.6-fc5.series | 1 + .../kernel_patches/series/ldiskfs-2.6-rhel5.series | 1 + .../series/ldiskfs-2.6-sles10.series | 1 + .../series/ldiskfs-2.6.18-vanilla.series | 1 + 7 files changed, 70 insertions(+), 58 deletions(-) diff --git a/ldiskfs/ChangeLog b/ldiskfs/ChangeLog index d9b030f..7c63386 100644 --- a/ldiskfs/ChangeLog +++ b/ldiskfs/ChangeLog @@ -20,6 +20,12 @@ Description: Kernel BUG at ... ldiskfs/ldiskfs/mballoc.c:3853 Details : Removing the underlying device (e.g. via a SCSI rescan) can cause a kernel BUG in ldiskfs_mb_discard_inode_preallocations(). +Severity : normal +Bugzilla : 14594 +Description: soft lockups on 1.6.2 MDS (is_subdir) +Details : don't add dentries with ".." to dcache and ignore such dentries in + iopen_lookup(). + -------------------------------------------------------------------------------- tbd Cluster File Systems, Inc. diff --git a/ldiskfs/kernel_patches/patches/iopen-2.6-fc5.patch b/ldiskfs/kernel_patches/patches/iopen-2.6-fc5.patch index fb5abff..8dbae2f 100644 --- a/ldiskfs/kernel_patches/patches/iopen-2.6-fc5.patch +++ b/ldiskfs/kernel_patches/patches/iopen-2.6-fc5.patch @@ -1,7 +1,7 @@ -Index: linux-2.6.16.27-0.9/fs/ext3/iopen.c +Index: linux-2.6.16.54-0.2.5/fs/ext3/iopen.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.16.27-0.9/fs/ext3/iopen.c 2007-06-29 08:33:12.000000000 +0200 +--- /dev/null ++++ linux-2.6.16.54-0.2.5/fs/ext3/iopen.c @@ -0,0 +1,259 @@ +/* + * linux/fs/ext3/iopen.c @@ -262,10 +262,10 @@ Index: linux-2.6.16.27-0.9/fs/ext3/iopen.c + + return 1; +} -Index: linux-2.6.16.27-0.9/fs/ext3/iopen.h +Index: linux-2.6.16.54-0.2.5/fs/ext3/iopen.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.16.27-0.9/fs/ext3/iopen.h 2007-06-29 08:24:49.000000000 +0200 +--- /dev/null ++++ linux-2.6.16.54-0.2.5/fs/ext3/iopen.h @@ -0,0 +1,23 @@ +/* + * iopen.h @@ -290,10 +290,10 @@ Index: linux-2.6.16.27-0.9/fs/ext3/iopen.h +#if !defined(HAVE_D_MOVE_LOCKED) && defined(HAVE___D_MOVE) +#define d_move_locked(dentry, target) __d_move(dentry, target) +#endif -Index: linux-2.6.16.27-0.9/fs/ext3/inode.c +Index: linux-2.6.16.54-0.2.5/fs/ext3/inode.c =================================================================== ---- linux-2.6.16.27-0.9.orig/fs/ext3/inode.c 2007-06-29 08:24:48.000000000 +0200 -+++ linux-2.6.16.27-0.9/fs/ext3/inode.c 2007-06-29 08:24:52.000000000 +0200 +--- linux-2.6.16.54-0.2.5.orig/fs/ext3/inode.c ++++ linux-2.6.16.54-0.2.5/fs/ext3/inode.c @@ -37,6 +37,7 @@ #include #include @@ -302,7 +302,7 @@ Index: linux-2.6.16.27-0.9/fs/ext3/inode.c #include "acl.h" static int ext3_writepage_trans_blocks(struct inode *inode); -@@ -2448,6 +2449,8 @@ +@@ -2448,6 +2449,8 @@ void ext3_read_inode(struct inode * inod ei->i_default_acl = EXT3_ACL_NOT_CACHED; #endif ei->i_block_alloc_info = NULL; @@ -311,11 +311,11 @@ Index: linux-2.6.16.27-0.9/fs/ext3/inode.c if (__ext3_get_inode_loc(inode, &iloc, 0)) goto bad_inode; -Index: linux-2.6.16.i686/fs/ext3/super.c +Index: linux-2.6.16.54-0.2.5/fs/ext3/super.c =================================================================== ---- linux-2.6.16.i686.orig/fs/ext3/super.c 2006-05-30 22:52:03.000000000 +0800 -+++ linux-2.6.16.i686/fs/ext3/super.c 2006-05-30 22:52:38.000000000 +0800 -@@ -634,6 +634,7 @@ +--- linux-2.6.16.54-0.2.5.orig/fs/ext3/super.c ++++ linux-2.6.16.54-0.2.5/fs/ext3/super.c +@@ -675,6 +675,7 @@ enum { Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota, Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_quota, Opt_noquota, Opt_ignore, Opt_barrier, Opt_err, Opt_resize, Opt_usrquota, @@ -323,7 +323,7 @@ Index: linux-2.6.16.i686/fs/ext3/super.c Opt_grpquota }; -@@ -682,6 +683,9 @@ +@@ -723,6 +724,9 @@ static match_table_t tokens = { {Opt_noquota, "noquota"}, {Opt_quota, "quota"}, {Opt_usrquota, "usrquota"}, @@ -333,7 +333,7 @@ Index: linux-2.6.16.i686/fs/ext3/super.c {Opt_barrier, "barrier=%u"}, {Opt_err, NULL}, {Opt_resize, "resize"}, -@@ -996,6 +1000,18 @@ +@@ -1037,6 +1041,18 @@ clear_qf_name: else clear_opt(sbi->s_mount_opt, BARRIER); break; @@ -352,10 +352,10 @@ Index: linux-2.6.16.i686/fs/ext3/super.c case Opt_ignore: break; case Opt_resize: -Index: linux-2.6.16.i686/fs/ext3/namei.c +Index: linux-2.6.16.54-0.2.5/fs/ext3/namei.c =================================================================== ---- linux-2.6.16.i686.orig/fs/ext3/namei.c 2006-05-30 22:52:00.000000000 +0800 -+++ linux-2.6.16.i686/fs/ext3/namei.c 2006-05-30 22:55:19.000000000 +0800 +--- linux-2.6.16.54-0.2.5.orig/fs/ext3/namei.c ++++ linux-2.6.16.54-0.2.5/fs/ext3/namei.c @@ -39,6 +39,7 @@ #include "namei.h" @@ -364,7 +364,7 @@ Index: linux-2.6.16.i686/fs/ext3/namei.c #include "acl.h" /* -@@ -995,6 +996,9 @@ +@@ -1004,6 +1005,9 @@ static struct dentry *ext3_lookup(struct if (dentry->d_name.len > EXT3_NAME_LEN) return ERR_PTR(-ENAMETOOLONG); @@ -374,16 +374,17 @@ Index: linux-2.6.16.i686/fs/ext3/namei.c bh = ext3_find_entry(dentry, &de); inode = NULL; if (bh) { -@@ -1005,7 +1009,7 @@ +@@ -1019,7 +1023,8 @@ static struct dentry *ext3_lookup(struct if (!inode) return ERR_PTR(-EACCES); } - return d_splice_alias(inode, dentry); -+ return iopen_connect_dentry(dentry, inode, 1); ++ ++ return iopen_connect_dentry(dentry, inode, 1); } -@@ -2046,10 +2050,6 @@ +@@ -2078,10 +2083,6 @@ static int ext3_rmdir (struct inode * di inode->i_nlink); inode->i_version++; inode->i_nlink = 0; @@ -394,7 +395,7 @@ Index: linux-2.6.16.i686/fs/ext3/namei.c ext3_orphan_add(handle, inode); inode->i_ctime = dir->i_ctime = dir->i_mtime = CURRENT_TIME_SEC; ext3_mark_inode_dirty(handle, inode); -@@ -2173,6 +2173,23 @@ +@@ -2205,6 +2206,23 @@ out_stop: return err; } @@ -418,7 +419,7 @@ Index: linux-2.6.16.i686/fs/ext3/namei.c static int ext3_link (struct dentry * old_dentry, struct inode * dir, struct dentry *dentry) { -@@ -2196,7 +2213,8 @@ +@@ -2228,7 +2246,8 @@ retry: ext3_inc_count(handle, inode); atomic_inc(&inode->i_count); @@ -428,10 +429,10 @@ Index: linux-2.6.16.i686/fs/ext3/namei.c ext3_journal_stop(handle); if (err == -ENOSPC && ext3_should_retry_alloc(dir->i_sb, &retries)) goto retry; -Index: linux-2.6.16.i686/fs/ext3/Makefile +Index: linux-2.6.16.54-0.2.5/fs/ext3/Makefile =================================================================== ---- linux-2.6.16.i686.orig/fs/ext3/Makefile 2006-03-20 13:53:29.000000000 +0800 -+++ linux-2.6.16.i686/fs/ext3/Makefile 2006-05-30 22:52:38.000000000 +0800 +--- linux-2.6.16.54-0.2.5.orig/fs/ext3/Makefile ++++ linux-2.6.16.54-0.2.5/fs/ext3/Makefile @@ -4,7 +4,7 @@ obj-$(CONFIG_EXT3_FS) += ext3.o @@ -441,11 +442,11 @@ Index: linux-2.6.16.i686/fs/ext3/Makefile ioctl.o namei.o super.o symlink.o hash.o resize.o ext3-$(CONFIG_EXT3_FS_XATTR) += xattr.o xattr_user.o xattr_trusted.o -Index: linux-2.6.16.i686/include/linux/ext3_fs.h +Index: linux-2.6.16.54-0.2.5/include/linux/ext3_fs.h =================================================================== ---- linux-2.6.16.i686.orig/include/linux/ext3_fs.h 2006-05-30 22:52:00.000000000 +0800 -+++ linux-2.6.16.i686/include/linux/ext3_fs.h 2006-05-30 22:52:38.000000000 +0800 -@@ -375,6 +375,8 @@ +--- linux-2.6.16.54-0.2.5.orig/include/linux/ext3_fs.h ++++ linux-2.6.16.54-0.2.5/include/linux/ext3_fs.h +@@ -375,6 +375,8 @@ struct ext3_inode { #define EXT3_MOUNT_QUOTA 0x80000 /* Some quota option set */ #define EXT3_MOUNT_USRQUOTA 0x100000 /* "old" user quota */ #define EXT3_MOUNT_GRPQUOTA 0x200000 /* "old" group quota */ diff --git a/ldiskfs/kernel_patches/patches/iopen-2.6.18-rhel5.patch b/ldiskfs/kernel_patches/patches/iopen-2.6.18-rhel5.patch index 2af2d7b..9b1c2c7 100644 --- a/ldiskfs/kernel_patches/patches/iopen-2.6.18-rhel5.patch +++ b/ldiskfs/kernel_patches/patches/iopen-2.6.18-rhel5.patch @@ -1,7 +1,7 @@ -Index: linux-2.6.18.8/fs/ext3/iopen.c +Index: linux-stage/fs/ext3/iopen.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18.8/fs/ext3/iopen.c 2007-07-24 14:00:57.000000000 +0200 +--- /dev/null ++++ linux-stage/fs/ext3/iopen.c @@ -0,0 +1,254 @@ +/* + * linux/fs/ext3/iopen.c @@ -257,10 +257,10 @@ Index: linux-2.6.18.8/fs/ext3/iopen.c + + return 1; +} -Index: linux-2.6.18.8/fs/ext3/iopen.h +Index: linux-stage/fs/ext3/iopen.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.18.8/fs/ext3/iopen.h 2007-07-24 13:59:56.000000000 +0200 +--- /dev/null ++++ linux-stage/fs/ext3/iopen.h @@ -0,0 +1,15 @@ +/* + * iopen.h @@ -277,10 +277,10 @@ Index: linux-2.6.18.8/fs/ext3/iopen.h +extern int ext3_iopen_get_inode(struct inode *inode); +extern struct dentry *iopen_connect_dentry(struct dentry *dentry, + struct inode *inode, int rehash); -Index: linux-2.6.18.8/fs/ext3/inode.c +Index: linux-stage/fs/ext3/inode.c =================================================================== ---- linux-2.6.18.8.orig/fs/ext3/inode.c 2007-07-24 12:25:00.000000000 +0200 -+++ linux-2.6.18.8/fs/ext3/inode.c 2007-07-24 13:59:56.000000000 +0200 +--- linux-stage.orig/fs/ext3/inode.c ++++ linux-stage/fs/ext3/inode.c @@ -37,6 +37,7 @@ #include #include @@ -298,10 +298,10 @@ Index: linux-2.6.18.8/fs/ext3/inode.c if (__ext3_get_inode_loc(inode, &iloc, 0)) goto bad_inode; -Index: linux-2.6.18.8/fs/ext3/super.c +Index: linux-stage/fs/ext3/super.c =================================================================== ---- linux-2.6.18.8.orig/fs/ext3/super.c 2007-07-24 12:25:00.000000000 +0200 -+++ linux-2.6.18.8/fs/ext3/super.c 2007-07-24 13:59:56.000000000 +0200 +--- linux-stage.orig/fs/ext3/super.c ++++ linux-stage/fs/ext3/super.c @@ -677,6 +677,7 @@ enum { Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota, Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_quota, Opt_noquota, @@ -339,10 +339,10 @@ Index: linux-2.6.18.8/fs/ext3/super.c case Opt_ignore: break; case Opt_resize: -Index: linux-2.6.18.8/fs/ext3/namei.c +Index: linux-stage/fs/ext3/namei.c =================================================================== ---- linux-2.6.18.8.orig/fs/ext3/namei.c 2007-07-24 13:59:54.000000000 +0200 -+++ linux-2.6.18.8/fs/ext3/namei.c 2007-07-24 13:59:56.000000000 +0200 +--- linux-stage.orig/fs/ext3/namei.c ++++ linux-stage/fs/ext3/namei.c @@ -39,6 +39,7 @@ #include "namei.h" @@ -361,16 +361,17 @@ Index: linux-2.6.18.8/fs/ext3/namei.c bh = ext3_find_entry(dentry, &de); inode = NULL; if (bh) { -@@ -1028,7 +1032,7 @@ static struct dentry *ext3_lookup(struct +@@ -1028,7 +1032,8 @@ static struct dentry *ext3_lookup(struct if (!inode) return ERR_PTR(-EACCES); } - return d_splice_alias(inode, dentry); -+ return iopen_connect_dentry(dentry, inode, 1); ++ ++ return iopen_connect_dentry(dentry, inode, 1); } -@@ -2077,10 +2081,6 @@ static int ext3_rmdir (struct inode * di +@@ -2077,10 +2082,6 @@ static int ext3_rmdir (struct inode * di inode->i_nlink); inode->i_version++; inode->i_nlink = 0; @@ -381,7 +382,7 @@ Index: linux-2.6.18.8/fs/ext3/namei.c ext3_orphan_add(handle, inode); inode->i_ctime = dir->i_ctime = dir->i_mtime = CURRENT_TIME_SEC; ext3_mark_inode_dirty(handle, inode); -@@ -2204,6 +2204,23 @@ out_stop: +@@ -2204,6 +2205,23 @@ out_stop: return err; } @@ -405,7 +406,7 @@ Index: linux-2.6.18.8/fs/ext3/namei.c static int ext3_link (struct dentry * old_dentry, struct inode * dir, struct dentry *dentry) { -@@ -2233,7 +2250,8 @@ retry: +@@ -2233,7 +2251,8 @@ retry: ext3_inc_count(handle, inode); atomic_inc(&inode->i_count); @@ -415,10 +416,10 @@ Index: linux-2.6.18.8/fs/ext3/namei.c ext3_journal_stop(handle); if (err == -ENOSPC && ext3_should_retry_alloc(dir->i_sb, &retries)) goto retry; -Index: linux-2.6.18.8/fs/ext3/Makefile +Index: linux-stage/fs/ext3/Makefile =================================================================== ---- linux-2.6.18.8.orig/fs/ext3/Makefile 2007-07-24 12:25:00.000000000 +0200 -+++ linux-2.6.18.8/fs/ext3/Makefile 2007-07-24 13:59:56.000000000 +0200 +--- linux-stage.orig/fs/ext3/Makefile ++++ linux-stage/fs/ext3/Makefile @@ -4,7 +4,7 @@ obj-$(CONFIG_EXT3_FS) += ext3.o @@ -428,10 +429,10 @@ Index: linux-2.6.18.8/fs/ext3/Makefile ioctl.o namei.o super.o symlink.o hash.o resize.o ext3-$(CONFIG_EXT3_FS_XATTR) += xattr.o xattr_user.o xattr_trusted.o -Index: linux-2.6.18.8/include/linux/ext3_fs.h +Index: linux-stage/include/linux/ext3_fs.h =================================================================== ---- linux-2.6.18.8.orig/include/linux/ext3_fs.h 2007-07-24 13:59:54.000000000 +0200 -+++ linux-2.6.18.8/include/linux/ext3_fs.h 2007-07-24 13:59:56.000000000 +0200 +--- linux-stage.orig/include/linux/ext3_fs.h ++++ linux-stage/include/linux/ext3_fs.h @@ -371,6 +371,8 @@ struct ext3_inode { #define EXT3_MOUNT_QUOTA 0x80000 /* Some quota option set */ #define EXT3_MOUNT_USRQUOTA 0x100000 /* "old" user quota */ diff --git a/ldiskfs/kernel_patches/series/ldiskfs-2.6-fc5.series b/ldiskfs/kernel_patches/series/ldiskfs-2.6-fc5.series index 84405ef..3d78f2a 100644 --- a/ldiskfs/kernel_patches/series/ldiskfs-2.6-fc5.series +++ b/ldiskfs/kernel_patches/series/ldiskfs-2.6-fc5.series @@ -9,3 +9,4 @@ ext3-nlinks-2.6.9.patch ext3-ialloc-2.6.patch ext3-remove-cond_resched-calls-2.6.12.patch ext3-filterdata-2.6.15.patch +ext3-lookup-dotdot-2.6.9.patch diff --git a/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel5.series b/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel5.series index f686f4c..6ffa8ee 100644 --- a/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel5.series +++ b/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel5.series @@ -21,3 +21,4 @@ ext3-dynlocks-2.6.18-vanilla.patch ext3-iam-common.patch ext3-iam-2.6.18-rhel5.patch ext3-orphans-delay.patch +ext3-lookup-dotdot-2.6.9.patch diff --git a/ldiskfs/kernel_patches/series/ldiskfs-2.6-sles10.series b/ldiskfs/kernel_patches/series/ldiskfs-2.6-sles10.series index 88ab764..726bf18 100644 --- a/ldiskfs/kernel_patches/series/ldiskfs-2.6-sles10.series +++ b/ldiskfs/kernel_patches/series/ldiskfs-2.6-sles10.series @@ -26,3 +26,4 @@ ext3-iam-common.patch ext3-iam-2.6-sles10.patch ext3-orphans-delay.patch ext3-statfs-2.6-sles10.patch +ext3-lookup-dotdot-2.6.9.patch diff --git a/ldiskfs/kernel_patches/series/ldiskfs-2.6.18-vanilla.series b/ldiskfs/kernel_patches/series/ldiskfs-2.6.18-vanilla.series index af760da..1480b06 100644 --- a/ldiskfs/kernel_patches/series/ldiskfs-2.6.18-vanilla.series +++ b/ldiskfs/kernel_patches/series/ldiskfs-2.6.18-vanilla.series @@ -21,3 +21,4 @@ ext3-dynlocks-2.6.18-vanilla.patch ext3-iam-common.patch ext3-iam-2.6.18-vanilla.patch ext3-orphans-delay.patch +ext3-lookup-dotdot-2.6.9.patch -- 1.8.3.1