b=14594
i=alex.zhuravlev
i=sheng.yang
add ext3-lookup-dotdot-2.6.9.patch to ldiskfs series.
This is solved by making sure that ext3_expand_extra_isize isn't
called from ext3_xattr_set_handle.
This is solved by making sure that ext3_expand_extra_isize isn't
called from ext3_xattr_set_handle.
+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().
+
--------------------------------------------------------------------------------
2008-01-11 Sun Microsystems, Inc.
--------------------------------------------------------------------------------
2008-01-11 Sun Microsystems, Inc.
-Index: linux-2.6.16.27-0.9/fs/ext3/iopen.c
+Index: linux-stage/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-stage/fs/ext3/iopen.c
@@ -0,0 +1,259 @@
+/*
+ * linux/fs/ext3/iopen.c
@@ -0,0 +1,259 @@
+/*
+ * linux/fs/ext3/iopen.c
-Index: linux-2.6.16.27-0.9/fs/ext3/iopen.h
+Index: linux-stage/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-stage/fs/ext3/iopen.h
@@ -0,0 +1,19 @@
+/*
+ * iopen.h
@@ -0,0 +1,19 @@
+/*
+ * iopen.h
+#if !defined(HAVE_D_MOVE_LOCKED) && defined(HAVE___D_MOVE)
+#define d_move_locked(dentry, target) __d_move(dentry, target)
+#endif
+#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-stage/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-stage.orig/fs/ext3/inode.c
++++ linux-stage/fs/ext3/inode.c
@@ -37,6 +37,7 @@
#include <linux/mpage.h>
#include <linux/uio.h>
@@ -37,6 +37,7 @@
#include <linux/mpage.h>
#include <linux/uio.h>
if (__ext3_get_inode_loc(inode, &iloc, 0))
goto bad_inode;
if (__ext3_get_inode_loc(inode, &iloc, 0))
goto bad_inode;
-Index: linux-2.6.16.27-0.9/fs/ext3/super.c
+Index: linux-stage/fs/ext3/super.c
===================================================================
===================================================================
---- linux-2.6.16.27-0.9.orig/fs/ext3/super.c 2007-06-29 08:24:48.000000000 +0200
-+++ linux-2.6.16.27-0.9/fs/ext3/super.c 2007-06-29 08:24:52.000000000 +0200
-@@ -678,6 +678,7 @@ enum {
+--- linux-stage.orig/fs/ext3/super.c
++++ linux-stage/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,
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,
-@@ -726,6 +727,9 @@ static match_table_t tokens = {
+@@ -723,6 +724,9 @@ static match_table_t tokens = {
{Opt_noquota, "noquota"},
{Opt_quota, "quota"},
{Opt_usrquota, "usrquota"},
{Opt_noquota, "noquota"},
{Opt_quota, "quota"},
{Opt_usrquota, "usrquota"},
{Opt_barrier, "barrier=%u"},
{Opt_err, NULL},
{Opt_resize, "resize"},
{Opt_barrier, "barrier=%u"},
{Opt_err, NULL},
{Opt_resize, "resize"},
-@@ -1040,6 +1044,18 @@ clear_qf_name:
+@@ -1037,6 +1041,18 @@ clear_qf_name:
else
clear_opt(sbi->s_mount_opt, BARRIER);
break;
else
clear_opt(sbi->s_mount_opt, BARRIER);
break;
case Opt_ignore:
break;
case Opt_resize:
case Opt_ignore:
break;
case Opt_resize:
-Index: linux-2.6.16.27-0.9/fs/ext3/namei.c
+Index: linux-stage/fs/ext3/namei.c
===================================================================
===================================================================
---- linux-2.6.16.27-0.9.orig/fs/ext3/namei.c 2007-06-29 08:24:47.000000000 +0200
-+++ linux-2.6.16.27-0.9/fs/ext3/namei.c 2007-06-29 08:24:49.000000000 +0200
+--- linux-stage.orig/fs/ext3/namei.c
++++ linux-stage/fs/ext3/namei.c
@@ -39,6 +39,7 @@
#include "namei.h"
@@ -39,6 +39,7 @@
#include "namei.h"
-@@ -1004,6 +1005,9 @@ static struct dentry *ext3_lookup(struct
+@@ -1013,6 +1014,9 @@ static struct dentry *ext3_lookup(struct
if (dentry->d_name.len > EXT3_NAME_LEN)
return ERR_PTR(-ENAMETOOLONG);
if (dentry->d_name.len > EXT3_NAME_LEN)
return ERR_PTR(-ENAMETOOLONG);
bh = ext3_find_entry(dentry, &de);
inode = NULL;
if (bh) {
bh = ext3_find_entry(dentry, &de);
inode = NULL;
if (bh) {
-@@ -1014,7 +1018,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);
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);
-@@ -2058,10 +2062,6 @@ static int ext3_rmdir (struct inode * di
+@@ -2079,10 +2084,6 @@ static int ext3_rmdir (struct inode * di
inode->i_nlink);
inode->i_version++;
inode->i_nlink = 0;
inode->i_nlink);
inode->i_version++;
inode->i_nlink = 0;
ext3_orphan_add(handle, inode);
inode->i_ctime = dir->i_ctime = dir->i_mtime = CURRENT_TIME_SEC;
ext3_mark_inode_dirty(handle, inode);
ext3_orphan_add(handle, inode);
inode->i_ctime = dir->i_ctime = dir->i_mtime = CURRENT_TIME_SEC;
ext3_mark_inode_dirty(handle, inode);
-@@ -2185,6 +2185,23 @@ out_stop:
+@@ -2206,6 +2207,23 @@ out_stop:
static int ext3_link (struct dentry * old_dentry,
struct inode * dir, struct dentry *dentry)
{
static int ext3_link (struct dentry * old_dentry,
struct inode * dir, struct dentry *dentry)
{
-@@ -2208,7 +2225,8 @@ retry:
+@@ -2229,7 +2247,8 @@ retry:
ext3_inc_count(handle, inode);
atomic_inc(&inode->i_count);
ext3_inc_count(handle, inode);
atomic_inc(&inode->i_count);
ext3_journal_stop(handle);
if (err == -ENOSPC && ext3_should_retry_alloc(dir->i_sb, &retries))
goto retry;
ext3_journal_stop(handle);
if (err == -ENOSPC && ext3_should_retry_alloc(dir->i_sb, &retries))
goto retry;
-Index: linux-2.6.16.27-0.9/fs/ext3/Makefile
+Index: linux-stage/fs/ext3/Makefile
===================================================================
===================================================================
---- linux-2.6.16.27-0.9.orig/fs/ext3/Makefile 2007-03-13 00:56:52.000000000 +0100
-+++ linux-2.6.16.27-0.9/fs/ext3/Makefile 2007-06-29 08:24:49.000000000 +0200
+--- linux-stage.orig/fs/ext3/Makefile
++++ linux-stage/fs/ext3/Makefile
@@ -4,7 +4,7 @@
obj-$(CONFIG_EXT3_FS) += ext3.o
@@ -4,7 +4,7 @@
obj-$(CONFIG_EXT3_FS) += ext3.o
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
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.27-0.9/include/linux/ext3_fs.h
+Index: linux-stage/include/linux/ext3_fs.h
===================================================================
===================================================================
---- linux-2.6.16.27-0.9.orig/include/linux/ext3_fs.h 2007-06-29 08:24:47.000000000 +0200
-+++ linux-2.6.16.27-0.9/include/linux/ext3_fs.h 2007-06-29 08:24:49.000000000 +0200
+--- linux-stage.orig/include/linux/ext3_fs.h
++++ linux-stage/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 */
@@ -375,6 +375,8 @@ struct ext3_inode {
#define EXT3_MOUNT_QUOTA 0x80000 /* Some quota option set */
#define EXT3_MOUNT_USRQUOTA 0x100000 /* "old" user quota */
-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
@@ -0,0 +1,254 @@
+/*
+ * linux/fs/ext3/iopen.c
-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
@@ -0,0 +1,15 @@
+/*
+ * 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);
+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 <linux/mpage.h>
#include <linux/uio.h>
@@ -37,6 +37,7 @@
#include <linux/mpage.h>
#include <linux/uio.h>
if (__ext3_get_inode_loc(inode, &iloc, 0))
goto bad_inode;
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,
@@ -677,6 +677,7 @@ enum {
Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota,
Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_quota, Opt_noquota,
case Opt_ignore:
break;
case Opt_resize:
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"
@@ -39,6 +39,7 @@
#include "namei.h"
bh = ext3_find_entry(dentry, &de);
inode = NULL;
if (bh) {
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);
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;
inode->i_nlink);
inode->i_version++;
inode->i_nlink = 0;
ext3_orphan_add(handle, inode);
inode->i_ctime = dir->i_ctime = dir->i_mtime = CURRENT_TIME_SEC;
ext3_mark_inode_dirty(handle, inode);
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:
static int ext3_link (struct dentry * old_dentry,
struct inode * dir, struct dentry *dentry)
{
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);
ext3_inc_count(handle, inode);
atomic_inc(&inode->i_count);
ext3_journal_stop(handle);
if (err == -ENOSPC && ext3_should_retry_alloc(dir->i_sb, &retries))
goto retry;
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
@@ -4,7 +4,7 @@
obj-$(CONFIG_EXT3_FS) += ext3.o
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
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 */
@@ -371,6 +371,8 @@ struct ext3_inode {
#define EXT3_MOUNT_QUOTA 0x80000 /* Some quota option set */
#define EXT3_MOUNT_USRQUOTA 0x100000 /* "old" user quota */
-Index: linux-2.6.16.27-0.9/fs/ext3/iopen.c
+Index: linux-2.6.22.15/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.22.15/fs/ext3/iopen.c
@@ -0,0 +1,256 @@
+/*
+ * linux/fs/ext3/iopen.c
@@ -0,0 +1,256 @@
+/*
+ * linux/fs/ext3/iopen.c
-Index: linux-2.6.16.27-0.9/fs/ext3/iopen.h
+Index: linux-2.6.22.15/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.22.15/fs/ext3/iopen.h
@@ -0,0 +1,19 @@
+/*
+ * iopen.h
@@ -0,0 +1,19 @@
+/*
+ * iopen.h
+#if !defined(HAVE_D_MOVE_LOCKED) && defined(HAVE___D_MOVE)
+#define d_move_locked(dentry, target) __d_move(dentry, target)
+#endif
+#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.22.15/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.22.15.orig/fs/ext3/inode.c
++++ linux-2.6.22.15/fs/ext3/inode.c
@@ -37,6 +37,7 @@
#include <linux/uio.h>
#include <linux/bio.h>
@@ -37,6 +37,7 @@
#include <linux/uio.h>
#include <linux/bio.h>
#include "acl.h"
static int ext3_writepage_trans_blocks(struct inode *inode);
#include "acl.h"
static int ext3_writepage_trans_blocks(struct inode *inode);
-@@ -2448,6 +2449,8 @@ void ext3_read_inode(struct inode * inod
+@@ -2604,6 +2605,8 @@ void ext3_read_inode(struct inode * inod
ei->i_default_acl = EXT3_ACL_NOT_CACHED;
#endif
ei->i_block_alloc_info = NULL;
ei->i_default_acl = EXT3_ACL_NOT_CACHED;
#endif
ei->i_block_alloc_info = NULL;
if (__ext3_get_inode_loc(inode, &iloc, 0))
goto bad_inode;
if (__ext3_get_inode_loc(inode, &iloc, 0))
goto bad_inode;
-Index: linux-2.6.16.27-0.9/fs/ext3/super.c
+Index: linux-2.6.22.15/fs/ext3/super.c
===================================================================
===================================================================
---- linux-2.6.16.27-0.9.orig/fs/ext3/super.c 2007-06-29 08:24:48.000000000 +0200
-+++ linux-2.6.16.27-0.9/fs/ext3/super.c 2007-06-29 08:24:52.000000000 +0200
-@@ -678,6 +678,7 @@ enum {
+--- linux-2.6.22.15.orig/fs/ext3/super.c
++++ linux-2.6.22.15/fs/ext3/super.c
+@@ -674,6 +674,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,
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,
-@@ -726,6 +727,9 @@ static match_table_t tokens = {
+@@ -723,6 +724,9 @@ static match_table_t tokens = {
{Opt_noquota, "noquota"},
{Opt_quota, "quota"},
{Opt_usrquota, "usrquota"},
{Opt_noquota, "noquota"},
{Opt_quota, "quota"},
{Opt_usrquota, "usrquota"},
{Opt_barrier, "barrier=%u"},
{Opt_err, NULL},
{Opt_resize, "resize"},
{Opt_barrier, "barrier=%u"},
{Opt_err, NULL},
{Opt_resize, "resize"},
-@@ -1040,6 +1044,18 @@ clear_qf_name:
+@@ -1038,6 +1042,18 @@ clear_qf_name:
else
clear_opt(sbi->s_mount_opt, BARRIER);
break;
else
clear_opt(sbi->s_mount_opt, BARRIER);
break;
case Opt_ignore:
break;
case Opt_resize:
case Opt_ignore:
break;
case Opt_resize:
-Index: linux-2.6.16.27-0.9/fs/ext3/namei.c
+Index: linux-2.6.22.15/fs/ext3/namei.c
===================================================================
===================================================================
---- linux-2.6.16.27-0.9.orig/fs/ext3/namei.c 2007-06-29 08:24:47.000000000 +0200
-+++ linux-2.6.16.27-0.9/fs/ext3/namei.c 2007-06-29 08:24:49.000000000 +0200
+--- linux-2.6.22.15.orig/fs/ext3/namei.c
++++ linux-2.6.22.15/fs/ext3/namei.c
@@ -39,6 +39,7 @@
#include "namei.h"
@@ -39,6 +39,7 @@
#include "namei.h"
-@@ -1004,6 +1005,9 @@ static struct dentry *ext3_lookup(struct
+@@ -1047,6 +1048,9 @@ static struct dentry *ext3_lookup(struct
if (dentry->d_name.len > EXT3_NAME_LEN)
return ERR_PTR(-ENAMETOOLONG);
if (dentry->d_name.len > EXT3_NAME_LEN)
return ERR_PTR(-ENAMETOOLONG);
bh = ext3_find_entry(dentry, &de);
inode = NULL;
if (bh) {
bh = ext3_find_entry(dentry, &de);
inode = NULL;
if (bh) {
-@@ -1014,7 +1018,7 @@ static struct dentry *ext3_lookup(struct
+@@ -1062,7 +1066,8 @@ static struct dentry *ext3_lookup(struct
if (!inode)
return ERR_PTR(-EACCES);
}
- return d_splice_alias(inode, dentry);
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);
-@@ -2058,10 +2062,6 @@ static int ext3_rmdir (struct inode * di
+@@ -2123,10 +2128,6 @@ static int ext3_rmdir (struct inode * di
inode->i_nlink);
inode->i_version++;
clear_nlink(inode);
inode->i_nlink);
inode->i_version++;
clear_nlink(inode);
ext3_orphan_add(handle, inode);
inode->i_ctime = dir->i_ctime = dir->i_mtime = CURRENT_TIME_SEC;
ext3_mark_inode_dirty(handle, inode);
ext3_orphan_add(handle, inode);
inode->i_ctime = dir->i_ctime = dir->i_mtime = CURRENT_TIME_SEC;
ext3_mark_inode_dirty(handle, inode);
-@@ -2185,6 +2185,23 @@ out_stop:
+@@ -2250,6 +2251,23 @@ out_stop:
static int ext3_link (struct dentry * old_dentry,
struct inode * dir, struct dentry *dentry)
{
static int ext3_link (struct dentry * old_dentry,
struct inode * dir, struct dentry *dentry)
{
-@@ -2208,7 +2225,8 @@ retry:
- ext3_inc_count(handle, inode);
+@@ -2279,7 +2297,8 @@ retry:
+ inc_nlink(inode);
atomic_inc(&inode->i_count);
- err = ext3_add_nondir(handle, dentry, inode);
atomic_inc(&inode->i_count);
- err = ext3_add_nondir(handle, dentry, inode);
ext3_journal_stop(handle);
if (err == -ENOSPC && ext3_should_retry_alloc(dir->i_sb, &retries))
goto retry;
ext3_journal_stop(handle);
if (err == -ENOSPC && ext3_should_retry_alloc(dir->i_sb, &retries))
goto retry;
-Index: linux-2.6.16.27-0.9/fs/ext3/Makefile
+Index: linux-2.6.22.15/fs/ext3/Makefile
===================================================================
===================================================================
---- linux-2.6.16.27-0.9.orig/fs/ext3/Makefile 2007-03-13 00:56:52.000000000 +0100
-+++ linux-2.6.16.27-0.9/fs/ext3/Makefile 2007-06-29 08:24:49.000000000 +0200
+--- linux-2.6.22.15.orig/fs/ext3/Makefile
++++ linux-2.6.22.15/fs/ext3/Makefile
@@ -4,7 +4,7 @@
obj-$(CONFIG_EXT3_FS) += ext3.o
@@ -4,7 +4,7 @@
obj-$(CONFIG_EXT3_FS) += ext3.o
ioctl.o namei.o super.o symlink.o hash.o resize.o ext3_jbd.o
ext3-$(CONFIG_EXT3_FS_XATTR) += xattr.o xattr_user.o xattr_trusted.o
ioctl.o namei.o super.o symlink.o hash.o resize.o ext3_jbd.o
ext3-$(CONFIG_EXT3_FS_XATTR) += xattr.o xattr_user.o xattr_trusted.o
-Index: linux-2.6.16.27-0.9/include/linux/ext3_fs.h
+Index: linux-2.6.22.15/include/linux/ext3_fs.h
===================================================================
===================================================================
---- linux-2.6.16.27-0.9.orig/include/linux/ext3_fs.h 2007-06-29 08:24:47.000000000 +0200
-+++ linux-2.6.16.27-0.9/include/linux/ext3_fs.h 2007-06-29 08:24:49.000000000 +0200
-@@ -375,6 +375,8 @@ struct ext3_inode {
+--- linux-2.6.22.15.orig/include/linux/ext3_fs.h
++++ linux-2.6.22.15/include/linux/ext3_fs.h
+@@ -384,6 +384,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 */
#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 */
ext3-ialloc-2.6.patch
ext3-remove-cond_resched-calls-2.6.12.patch
ext3-filterdata-2.6.15.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
ext3-unlink-race.patch
ext3-fiemap-2.6.18-vanilla.patch
ext3-statfs-2.6-rhel5.patch
ext3-unlink-race.patch
ext3-fiemap-2.6.18-vanilla.patch
ext3-statfs-2.6-rhel5.patch
+ext3-lookup-dotdot-2.6.9.patch
ext3-mmp-2.6-sles10.patch
ext3-fiemap-2.6-sles10.patch
ext3-statfs-2.6-sles10.patch
ext3-mmp-2.6-sles10.patch
ext3-fiemap-2.6-sles10.patch
ext3-statfs-2.6-sles10.patch
+ext3-lookup-dotdot-2.6.9.patch
ext3-mmp-2.6.18-vanilla.patch
ext3-handle-directory-corruption-better.patch
ext3-fiemap-2.6.18-vanilla.patch
ext3-mmp-2.6.18-vanilla.patch
ext3-handle-directory-corruption-better.patch
ext3-fiemap-2.6.18-vanilla.patch
+ext3-lookup-dotdot-2.6.9.patch
ext3-mmp-2.6.22-vanilla.patch
ext3-fiemap-2.6.22-vanilla.patch
ext3-statfs-2.6.22.patch
ext3-mmp-2.6.22-vanilla.patch
ext3-fiemap-2.6.22-vanilla.patch
ext3-statfs-2.6.22.patch
+ext3-lookup-dotdot-2.6.9.patch
git://git.whamcloud.com / fs / lustre-release.git / commitdiff