landing b_cmobd_merge on HEAD

[fs/lustre-release.git] / ldiskfs / kernel_patches / patches / ext3-wantedi-2.6-suse.patch

diff --git a/lustre/kernel_patches/patches/ext3-wantedi-2.6.3.patch b/ldiskfs/kernel_patches/patches/ext3-wantedi-2.6-suse.patch
similarity index 91%
rename from lustre/kernel_patches/patches/ext3-wantedi-2.6.3.patch
rename to ldiskfs/kernel_patches/patches/ext3-wantedi-2.6-suse.patch
index 3f20da7..a4867a5 100644 (file)
--- a/lustre/kernel_patches/patches/ext3-wantedi-2.6.3.patch
+++ b/ldiskfs/kernel_patches/patches/ext3-wantedi-2.6-suse.patch
@@ -154,22 +154,6 @@ Index: uml-2.6.3/fs/ext3/namei.c
        err = PTR_ERR(inode);
        if (IS_ERR(inode))
                goto out_stop;
-Index: uml-2.6.3/include/linux/dcache.h
-===================================================================
---- uml-2.6.3.orig/include/linux/dcache.h      2004-02-21 00:19:14.365988600 +0800
-+++ uml-2.6.3/include/linux/dcache.h   2004-02-21 00:21:04.612228624 +0800
-@@ -25,6 +25,11 @@
- 
- #define IS_ROOT(x) ((x) == (x)->d_parent)
- 
-+struct dentry_params {
-+      unsigned long   p_inum;
-+      void            *p_ptr;
-+};
-+
- /*
-  * "quick string" -- eases parameter passing, but more importantly
-  * saves "metadata" about the string (ie length and the hash).
 Index: uml-2.6.3/include/linux/ext3_fs.h
 ===================================================================
 --- uml-2.6.3.orig/include/linux/ext3_fs.h     2004-01-09 14:59:44.000000000 +0800