X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=ldiskfs%2Fkernel_patches%2Fpatches%2Fiopen-2.6-fc5.patch;h=bc358537b1eca3537e0016bd9a5383714bb4293f;hp=4b6b7be0fa6ff3121a36c4420a660a10809c76b6;hb=48961c4d439f5f72e4604384ec5dac3f958fbc2c;hpb=c8cacd0713dd6ca12866e040c7b835d9323bf4e3 diff --git a/ldiskfs/kernel_patches/patches/iopen-2.6-fc5.patch b/ldiskfs/kernel_patches/patches/iopen-2.6-fc5.patch index 4b6b7be..bc35853 100644 --- a/ldiskfs/kernel_patches/patches/iopen-2.6-fc5.patch +++ b/ldiskfs/kernel_patches/patches/iopen-2.6-fc5.patch @@ -1,8 +1,8 @@ -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 -@@ -0,0 +1,259 @@ +--- /dev/null ++++ linux-2.6.16.54-0.2.5/fs/ext3/iopen.c +@@ -0,0 +1,296 @@ +/* + * linux/fs/ext3/iopen.c + * @@ -184,6 +184,42 @@ Index: linux-2.6.16.27-0.9/fs/ext3/iopen.c +} + +/* ++ * Similar as d_instantiate() except that it drops the disconnected ++ * dentry if any. ++ */ ++void iopen_d_instantiate(struct dentry *dentry, struct inode * inode) ++{ ++ struct dentry *dis_dentry; ++ ++ /* verify this dentry is really new */ ++ assert(dentry->d_inode == NULL); ++ assert(list_empty(&dentry->d_alias)); ++ ++ spin_lock(&dcache_lock); ++ if (!inode || !test_opt(inode->i_sb, IOPEN) || ++ list_empty(&inode->i_dentry)) ++ goto do_instantiate; ++ ++ /* a disconnected dentry has been added in our back, ++ * we have to drop this dentry, see bug 16362/15713*/ ++ dis_dentry = list_entry(inode->i_dentry.next, struct dentry, d_alias); ++ spin_lock(&dis_dentry->d_lock); ++ assert(dis_dentry->d_alias.next == &inode->i_dentry); ++ assert(dis_dentry->d_alias.prev == &inode->i_dentry); ++ assert(dis_dentry->d_flags & DCACHE_DISCONNECTED); ++ __d_drop(dis_dentry); ++ list_del_init(&dis_dentry->d_alias); ++ spin_unlock(&dis_dentry->d_lock); ++ ++do_instantiate: ++ if (inode) ++ list_add(&dentry->d_alias, &inode->i_dentry); ++ dentry->d_inode = inode; ++ spin_unlock(&dcache_lock); ++ security_d_instantiate(dentry, inode); ++} ++ ++/* + * These are the special structures for the iopen pseudo directory. + */ + @@ -249,6 +285,7 @@ Index: linux-2.6.16.27-0.9/fs/ext3/iopen.c + inode->i_ctime = CURRENT_TIME; + inode->i_mtime = CURRENT_TIME; + EXT3_I(inode)->i_dtime = 0; ++ EXT3_I(inode)->i_file_acl = 0; + inode->i_blksize = PAGE_SIZE; /* This is the optimal IO size + * (for stat), not the fs block + * size */ @@ -262,11 +299,11 @@ 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 -@@ -0,0 +1,19 @@ +--- /dev/null ++++ linux-2.6.16.54-0.2.5/fs/ext3/iopen.h +@@ -0,0 +1,20 @@ +/* + * iopen.h + * @@ -282,14 +319,15 @@ Index: linux-2.6.16.27-0.9/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); ++extern void iopen_d_instantiate(struct dentry *dentry, struct inode * inode); + +#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 @@ -307,11 +345,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.27-0.9/fs/ext3/super.c +Index: linux-2.6.16.54-0.2.5/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.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, @@ -319,7 +357,7 @@ Index: linux-2.6.16.27-0.9/fs/ext3/super.c Opt_grpquota }; -@@ -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"}, @@ -329,7 +367,7 @@ Index: linux-2.6.16.27-0.9/fs/ext3/super.c {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; @@ -348,10 +386,10 @@ Index: linux-2.6.16.27-0.9/fs/ext3/super.c case Opt_ignore: break; case Opt_resize: -Index: linux-2.6.16.27-0.9/fs/ext3/namei.c +Index: linux-2.6.16.54-0.2.5/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.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" @@ -360,7 +398,7 @@ Index: linux-2.6.16.27-0.9/fs/ext3/namei.c #include "acl.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); @@ -370,16 +408,35 @@ Index: linux-2.6.16.27-0.9/fs/ext3/namei.c 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); -+ 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 +@@ -1649,7 +1654,7 @@ static int ext3_add_nondir(handle_t *han + int err = ext3_add_entry(handle, dentry, inode); + if (!err) { + ext3_mark_inode_dirty(handle, inode); +- d_instantiate(dentry, inode); ++ iopen_d_instantiate(dentry, inode); + return 0; + } + ext3_dec_count(handle, inode); +@@ -1811,7 +1816,7 @@ retry: + dir->i_nlink++; + ext3_update_dx_flag(dir); + ext3_mark_inode_dirty(handle, dir); +- d_instantiate(dentry, inode); ++ iopen_d_instantiate(dentry, inode); + out_stop: + ext3_journal_stop(handle); + if (err == -ENOSPC && ext3_should_retry_alloc(dir->i_sb, &retries)) +@@ -2079,10 +2084,6 @@ static int ext3_rmdir (struct inode * di inode->i_nlink); inode->i_version++; inode->i_nlink = 0; @@ -390,7 +447,7 @@ Index: linux-2.6.16.27-0.9/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); -@@ -2185,6 +2185,23 @@ out_stop: +@@ -2206,6 +2207,23 @@ out_stop: return err; } @@ -414,7 +471,7 @@ Index: linux-2.6.16.27-0.9/fs/ext3/namei.c 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); @@ -424,10 +481,10 @@ Index: linux-2.6.16.27-0.9/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.27-0.9/fs/ext3/Makefile +Index: linux-2.6.16.54-0.2.5/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.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 @@ -437,10 +494,10 @@ Index: linux-2.6.16.27-0.9/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.27-0.9/include/linux/ext3_fs.h +Index: linux-2.6.16.54-0.2.5/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-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 */