Branch b1_6

[fs/lustre-release.git] / ldiskfs / kernel_patches / patches / iopen-2.6.18-rhel5.patch

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 (file)
--- 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 <linux/mpage.h>
  #include <linux/uio.h>
@@ -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 */