Whamcloud - gitweb
git://git.whamcloud.com / fs / lustre-release.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
smash the HEAD with the contents of b_cmd. HEAD_PRE_CMD_SMASH and
[fs/lustre-release.git] / lustre / kernel_patches / patches / ext3-wantedi-2.6.patch
diff --git a/lustre/kernel_patches/patches/ext3-wantedi-2.6-suse.patch b/lustre/kernel_patches/patches/ext3-wantedi-2.6.patch
similarity index 72%
rename from lustre/kernel_patches/patches/ext3-wantedi-2.6-suse.patch
rename to lustre/kernel_patches/patches/ext3-wantedi-2.6.patch
index a4867a5..ce897f5 100644 (file)
--- a/lustre/kernel_patches/patches/ext3-wantedi-2.6-suse.patch
+++ b/lustre/kernel_patches/patches/ext3-wantedi-2.6.patch
@@ -5,11 +5,9 @@
  include/linux/ext3_fs.h |    5 ++++-
  5 files changed, 85 insertions(+), 6 deletions(-)
 
-Index: uml-2.6.3/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
-@@ -420,7 +420,8 @@
+--- linux-2.6.0-test5/fs/ext3/ialloc.c~ext3-wantedi-2.6        2003-06-24 18:05:25.000000000 +0400
++++ linux-2.6.0-test5-alexey/fs/ext3/ialloc.c  2003-09-28 13:40:23.000000000 +0400
+@@ -420,7 +420,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.
   */
@@ -19,10 +17,10 @@ Index: uml-2.6.3/fs/ext3/ialloc.c
  {
        struct super_block *sb;
        struct buffer_head *bitmap_bh = NULL;
-@@ -448,6 +449,38 @@
+@@ -448,6 +449,38 @@ struct inode *ext3_new_inode(handle_t *h
  
+       es = EXT3_SB(sb)->s_es;
        sbi = EXT3_SB(sb);
-       es = sbi->s_es;
 +      if (goal) {
 +              group = (goal - 1) / EXT3_INODES_PER_GROUP(sb);
 +              ino = (goal - 1) % EXT3_INODES_PER_GROUP(sb);
@@ -58,11 +56,9 @@ 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
-===================================================================
---- 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.0-test5/fs/ext3/ioctl.c~ext3-wantedi-2.6 2003-06-24 18:05:25.000000000 +0400
++++ linux-2.6.0-test5-alexey/fs/ext3/ioctl.c   2003-09-28 13:45:54.000000000 +0400
+@@ -24,6 +24,31 @@ int ext3_ioctl (struct inode * inode, st
        ext3_debug ("cmd = %u, arg = %lu\n", cmd, arg);
  
        switch (cmd) {
@@ -94,11 +90,9 @@ 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
-===================================================================
---- 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.0-test5/fs/ext3/namei.c~ext3-wantedi-2.6 2003-09-19 18:01:48.000000000 +0400
++++ linux-2.6.0-test5-alexey/fs/ext3/namei.c   2003-09-28 13:40:23.000000000 +0400
+@@ -1617,6 +1617,19 @@ static int ext3_add_nondir(handle_t *han
        return err;
  }
  
@@ -118,7 +112,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 @@
+@@ -1640,7 +1653,7 @@ static int ext3_create (struct inode * d
        if (IS_DIRSYNC(dir))
                handle->h_sync = 1;
  
@@ -127,7 +121,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 @@
+@@ -1670,7 +1683,7 @@ static int ext3_mknod (struct inode * di
        if (IS_DIRSYNC(dir))
                handle->h_sync = 1;
  
@@ -136,7 +130,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 @@
+@@ -1702,7 +1715,7 @@ static int ext3_mkdir(struct inode * dir
        if (IS_DIRSYNC(dir))
                handle->h_sync = 1;
  
@@ -145,7 +139,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 @@
+@@ -2094,7 +2107,7 @@ static int ext3_symlink (struct inode * 
        if (IS_DIRSYNC(dir))
                handle->h_sync = 1;
  
@@ -154,11 +148,23 @@ 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
-===================================================================
---- 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
-@@ -203,6 +203,7 @@
+--- linux-2.6.0-test5/include/linux/dcache.h~ext3-wantedi-2.6  2003-09-28 13:40:22.000000000 +0400
++++ linux-2.6.0-test5-alexey/include/linux/dcache.h    2003-09-28 13:40:23.000000000 +0400
+@@ -25,6 +25,11 @@ struct vfsmount;
+ 
+ #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).
+--- linux-2.6.0-test5/include/linux/ext3_fs.h~ext3-wantedi-2.6 2003-09-19 18:01:10.000000000 +0400
++++ linux-2.6.0-test5-alexey/include/linux/ext3_fs.h   2003-09-28 13:40:23.000000000 +0400
+@@ -203,6 +203,7 @@ struct ext3_group_desc
  #define       EXT3_IOC_SETFLAGS               _IOW('f', 2, long)
  #define       EXT3_IOC_GETVERSION             _IOR('f', 3, long)
  #define       EXT3_IOC_SETVERSION             _IOW('f', 4, long)
@@ -166,7 +172,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 @@
+@@ -707,7 +708,8 @@ extern int ext3fs_dirhash(const char *na
                          dx_hash_info *hinfo);
  
  /* ialloc.c */
@@ -176,9 +182,11 @@ 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 @@
+@@ -792,4 +794,5 @@ extern struct inode_operations ext3_fast
  
  #endif        /* __KERNEL__ */
  
 +#define EXT3_IOC_CREATE_INUM                  _IOW('f', 5, long)
  #endif        /* _LINUX_EXT3_FS_H */
+
+_
Lustre primary development and releases