* 11293 - removed LP_PROG_LINUX leftover from portals builds

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

diff --git a/lustre/kernel_patches/patches/ext3-wantedi-2.6-suse.patch b/lustre/kernel_patches/patches/ext3-wantedi-2.6-suse.patch
index a4867a5..4fd69a5 100644 (file)
--- a/lustre/kernel_patches/patches/ext3-wantedi-2.6-suse.patch
+++ b/lustre/kernel_patches/patches/ext3-wantedi-2.6-suse.patch
@@ -5,10 +5,10 @@
  include/linux/ext3_fs.h |    5 ++++-
  5 files changed, 85 insertions(+), 6 deletions(-)
 
-Index: uml-2.6.3/fs/ext3/ialloc.c
+Index: linux-2.6.7/fs/ext3/ialloc.c
 ===================================================================
---- uml-2.6.3.orig/fs/ext3/ialloc.c    2004-02-20 15:00:48.000000000 +0800
-+++ uml-2.6.3/fs/ext3/ialloc.c 2004-02-21 00:24:45.202693776 +0800
+--- linux-2.6.7.orig/fs/ext3/ialloc.c  2005-03-24 00:27:43.282608616 +0800
++++ linux-2.6.7/fs/ext3/ialloc.c       2005-03-24 00:27:43.888516504 +0800
 @@ -420,7 +420,8 @@
   * For other inodes, search forward from the parent directory's block
   * group to find a free inode.
@@ -58,11 +58,19 @@ Index: uml-2.6.3/fs/ext3/ialloc.c
        if (S_ISDIR(mode)) {
                if (test_opt (sb, OLDALLOC))
                        group = find_group_dir(sb, dir);
-Index: uml-2.6.3/fs/ext3/ioctl.c
+Index: linux-2.6.7/fs/ext3/ioctl.c
 ===================================================================
---- uml-2.6.3.orig/fs/ext3/ioctl.c     2004-01-09 14:59:26.000000000 +0800
-+++ uml-2.6.3/fs/ext3/ioctl.c  2004-02-21 00:21:04.541239416 +0800
-@@ -24,6 +24,31 @@
+--- linux-2.6.7.orig/fs/ext3/ioctl.c   2004-06-16 13:19:13.000000000 +0800
++++ linux-2.6.7/fs/ext3/ioctl.c        2005-03-24 00:31:16.113253440 +0800
+@@ -9,6 +9,7 @@
+ 
+ #include <linux/fs.h>
+ #include <linux/jbd.h>
++#include <linux/namei.h>
+ #include <linux/ext3_fs.h>
+ #include <linux/ext3_jbd.h>
+ #include <linux/time.h>
+@@ -24,6 +25,31 @@
        ext3_debug ("cmd = %u, arg = %lu\n", cmd, arg);
  
        switch (cmd) {
@@ -93,12 +101,12 @@ Index: uml-2.6.3/fs/ext3/ioctl.c
 +      }
        case EXT3_IOC_GETFLAGS:
                flags = ei->i_flags & EXT3_FL_USER_VISIBLE;
-               return put_user(flags, (int *) arg);
-Index: uml-2.6.3/fs/ext3/namei.c
+               return put_user(flags, (int __user *) arg);
+Index: linux-2.6.7/fs/ext3/namei.c
 ===================================================================
---- uml-2.6.3.orig/fs/ext3/namei.c     2004-02-20 15:01:27.000000000 +0800
-+++ uml-2.6.3/fs/ext3/namei.c  2004-02-21 00:21:04.611228776 +0800
-@@ -1617,6 +1617,19 @@
+--- linux-2.6.7.orig/fs/ext3/namei.c   2005-03-24 00:27:43.536570008 +0800
++++ linux-2.6.7/fs/ext3/namei.c        2005-03-24 00:27:43.893515744 +0800
+@@ -1939,6 +1939,19 @@
        return err;
  }
  
@@ -118,7 +126,7 @@ Index: uml-2.6.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
-@@ -1640,7 +1653,7 @@
+@@ -1963,7 +1976,7 @@
        if (IS_DIRSYNC(dir))
                handle->h_sync = 1;
  
@@ -127,7 +135,7 @@ Index: uml-2.6.3/fs/ext3/namei.c
        err = PTR_ERR(inode);
        if (!IS_ERR(inode)) {
                inode->i_op = &ext3_file_inode_operations;
-@@ -1670,7 +1683,7 @@
+@@ -1994,7 +2007,7 @@
        if (IS_DIRSYNC(dir))
                handle->h_sync = 1;
  
@@ -136,7 +144,7 @@ Index: uml-2.6.3/fs/ext3/namei.c
        err = PTR_ERR(inode);
        if (!IS_ERR(inode)) {
                init_special_inode(inode, inode->i_mode, rdev);
-@@ -1702,7 +1715,7 @@
+@@ -2027,7 +2040,7 @@
        if (IS_DIRSYNC(dir))
                handle->h_sync = 1;
  
@@ -145,7 +153,7 @@ Index: uml-2.6.3/fs/ext3/namei.c
        err = PTR_ERR(inode);
        if (IS_ERR(inode))
                goto out_stop;
-@@ -2094,7 +2107,7 @@
+@@ -2439,7 +2452,7 @@
        if (IS_DIRSYNC(dir))
                handle->h_sync = 1;
  
@@ -154,10 +162,10 @@ 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/ext3_fs.h
+Index: linux-2.6.7/include/linux/ext3_fs.h
 ===================================================================
---- uml-2.6.3.orig/include/linux/ext3_fs.h     2004-01-09 14:59:44.000000000 +0800
-+++ uml-2.6.3/include/linux/ext3_fs.h  2004-02-21 00:21:04.613228472 +0800
+--- linux-2.6.7.orig/include/linux/ext3_fs.h   2005-03-24 00:27:43.542569096 +0800
++++ linux-2.6.7/include/linux/ext3_fs.h        2005-03-24 00:27:43.893515744 +0800
 @@ -203,6 +203,7 @@
  #define       EXT3_IOC_SETFLAGS               _IOW('f', 2, long)
  #define       EXT3_IOC_GETVERSION             _IOR('f', 3, long)
@@ -166,7 +174,7 @@ Index: uml-2.6.3/include/linux/ext3_fs.h
  #define       EXT3_IOC_GETVERSION_OLD         _IOR('v', 1, long)
  #define       EXT3_IOC_SETVERSION_OLD         _IOW('v', 2, long)
  #ifdef CONFIG_JBD_DEBUG
-@@ -707,7 +708,8 @@
+@@ -708,7 +709,8 @@
                          dx_hash_info *hinfo);
  
  /* ialloc.c */
@@ -176,7 +184,7 @@ Index: uml-2.6.3/include/linux/ext3_fs.h
  extern void ext3_free_inode (handle_t *, struct inode *);
  extern struct inode * ext3_orphan_get (struct super_block *, unsigned long);
  extern unsigned long ext3_count_free_inodes (struct super_block *);
-@@ -792,4 +794,5 @@
+@@ -793,4 +795,5 @@
  
  #endif        /* __KERNEL__ */