Branch b1_6

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

diff --git a/ldiskfs/kernel_patches/patches/ext3-wantedi-2.6-rhel4.patch b/ldiskfs/kernel_patches/patches/ext3-wantedi-2.6-rhel4.patch
index f71e470..db4a12c 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ext3-wantedi-2.6-rhel4.patch
+++ b/ldiskfs/kernel_patches/patches/ext3-wantedi-2.6-rhel4.patch
@@ -1,6 +1,7 @@
-diff -urp RH_2_6_9_42_0_3.orig/fs/ext3/ialloc.c RH_2_6_9_42_0_3/fs/ext3/ialloc.c
---- RH_2_6_9_42_0_3.orig/fs/ext3/ialloc.c      2006-10-23 13:32:46.000000000 +0300
-+++ RH_2_6_9_42_0_3/fs/ext3/ialloc.c   2007-02-16 07:22:28.000000000 +0200
+Index: linux-2.6.9/fs/ext3/ialloc.c
+===================================================================
+--- linux-2.6.9.orig/fs/ext3/ialloc.c  2007-03-13 00:47:22.000000000 +0100
++++ linux-2.6.9/fs/ext3/ialloc.c       2007-07-26 09:23:37.000000000 +0200
 @@ -419,7 +419,8 @@ static int find_group_other(struct super
   * For other inodes, search forward from the parent directory's block
   * group to find a free inode.
@@ -53,10 +54,19 @@ diff -urp RH_2_6_9_42_0_3.orig/fs/ext3/ialloc.c RH_2_6_9_42_0_3/fs/ext3/ialloc.c
        if (S_ISDIR(mode)) {
                if (test_opt (sb, OLDALLOC))
                        group = find_group_dir(sb, dir);
-diff -urp RH_2_6_9_42_0_3.orig/fs/ext3/ioctl.c RH_2_6_9_42_0_3/fs/ext3/ioctl.c
---- RH_2_6_9_42_0_3.orig/fs/ext3/ioctl.c       2006-10-23 13:32:46.000000000 +0300
-+++ RH_2_6_9_42_0_3/fs/ext3/ioctl.c    2007-02-16 07:22:28.000000000 +0200
-@@ -25,6 +25,31 @@ int ext3_ioctl (struct inode * inode, st
+Index: linux-2.6.9/fs/ext3/ioctl.c
+===================================================================
+--- linux-2.6.9.orig/fs/ext3/ioctl.c   2007-03-13 00:47:22.000000000 +0100
++++ linux-2.6.9/fs/ext3/ioctl.c        2007-07-26 09:25:24.000000000 +0200
+@@ -13,6 +13,7 @@
+ #include <linux/ext3_jbd.h>
+ #include <linux/time.h>
+ #include <asm/uaccess.h>
++#include <linux/namei.h>
+ 
+ 
+ int ext3_ioctl (struct inode * inode, struct file * filp, unsigned int cmd,
+@@ -25,6 +26,31 @@ int ext3_ioctl (struct inode * inode, st
        ext3_debug ("cmd = %u, arg = %lu\n", cmd, arg);
  
        switch (cmd) {
@@ -88,9 +98,10 @@ diff -urp RH_2_6_9_42_0_3.orig/fs/ext3/ioctl.c RH_2_6_9_42_0_3/fs/ext3/ioctl.c
        case EXT3_IOC_GETFLAGS:
                flags = ei->i_flags & EXT3_FL_USER_VISIBLE;
                return put_user(flags, (int __user *) arg);
-diff -urp RH_2_6_9_42_0_3.orig/fs/ext3/namei.c RH_2_6_9_42_0_3/fs/ext3/namei.c
---- RH_2_6_9_42_0_3.orig/fs/ext3/namei.c       2006-10-23 13:32:59.000000000 +0300
-+++ RH_2_6_9_42_0_3/fs/ext3/namei.c    2007-02-22 18:58:13.000000000 +0200
+Index: linux-2.6.9/fs/ext3/namei.c
+===================================================================
+--- linux-2.6.9.orig/fs/ext3/namei.c   2007-03-13 00:47:27.000000000 +0100
++++ linux-2.6.9/fs/ext3/namei.c        2007-07-26 09:23:37.000000000 +0200
 @@ -97,6 +97,7 @@ struct dx_entry
        __le32 block;
  };
@@ -114,7 +125,7 @@ diff -urp RH_2_6_9_42_0_3.orig/fs/ext3/namei.c RH_2_6_9_42_0_3/fs/ext3/namei.c
  #ifdef CONFIG_EXT3_INDEX
  static inline unsigned dx_get_block (struct dx_entry *entry);
  static void dx_set_block (struct dx_entry *entry, unsigned value);
-@@ -1624,6 +1633,20 @@ static int ext3_add_nondir(handle_t *han
+@@ -1633,6 +1642,20 @@ static int ext3_add_nondir(handle_t *han
        return err;
  }
  
@@ -135,7 +146,7 @@ diff -urp RH_2_6_9_42_0_3.orig/fs/ext3/namei.c RH_2_6_9_42_0_3/fs/ext3/namei.c
  /*
   * By the time this is called, we already have created
   * the directory cache entry for the new file, but it
-@@ -1649,7 +1672,7 @@ retry:
+@@ -1658,7 +1681,7 @@ retry:
        if (IS_DIRSYNC(dir))
                handle->h_sync = 1;
  
@@ -144,7 +155,7 @@ diff -urp RH_2_6_9_42_0_3.orig/fs/ext3/namei.c RH_2_6_9_42_0_3/fs/ext3/namei.c
        err = PTR_ERR(inode);
        if (!IS_ERR(inode)) {
                inode->i_op = &ext3_file_inode_operations;
-@@ -1683,7 +1706,7 @@ retry:
+@@ -1692,7 +1715,7 @@ retry:
        if (IS_DIRSYNC(dir))
                handle->h_sync = 1;
  
@@ -153,7 +164,7 @@ diff -urp RH_2_6_9_42_0_3.orig/fs/ext3/namei.c RH_2_6_9_42_0_3/fs/ext3/namei.c
        err = PTR_ERR(inode);
        if (!IS_ERR(inode)) {
                init_special_inode(inode, inode->i_mode, rdev);
-@@ -1719,7 +1742,7 @@ retry:
+@@ -1728,7 +1751,7 @@ retry:
        if (IS_DIRSYNC(dir))
                handle->h_sync = 1;
  
@@ -162,7 +173,7 @@ diff -urp RH_2_6_9_42_0_3.orig/fs/ext3/namei.c RH_2_6_9_42_0_3/fs/ext3/namei.c
        err = PTR_ERR(inode);
        if (IS_ERR(inode))
                goto out_stop;
-@@ -2124,7 +2147,7 @@ retry:
+@@ -2133,7 +2156,7 @@ retry:
        if (IS_DIRSYNC(dir))
                handle->h_sync = 1;
  
@@ -171,9 +182,10 @@ diff -urp RH_2_6_9_42_0_3.orig/fs/ext3/namei.c RH_2_6_9_42_0_3/fs/ext3/namei.c
        err = PTR_ERR(inode);
        if (IS_ERR(inode))
                goto out_stop;
-diff -urp RH_2_6_9_42_0_3.orig/include/linux/ext3_fs.h RH_2_6_9_42_0_3/include/linux/ext3_fs.h
---- RH_2_6_9_42_0_3.orig/include/linux/ext3_fs.h       2006-10-23 13:32:46.000000000 +0300
-+++ RH_2_6_9_42_0_3/include/linux/ext3_fs.h    2007-02-16 07:22:28.000000000 +0200
+Index: linux-2.6.9/include/linux/ext3_fs.h
+===================================================================
+--- linux-2.6.9.orig/include/linux/ext3_fs.h   2007-03-13 00:47:22.000000000 +0100
++++ linux-2.6.9/include/linux/ext3_fs.h        2007-07-26 09:23:37.000000000 +0200
 @@ -741,7 +741,8 @@ extern int ext3fs_dirhash(const char *na
                          dx_hash_info *hinfo);