Whamcloud - gitweb
git://git.whamcloud.com / fs / lustre-release.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Branch b1_6
[fs/lustre-release.git] / ldiskfs / kernel_patches / patches / iopen-2.6.22-vanilla.patch
diff --git a/ldiskfs/kernel_patches/patches/iopen-2.6.22-vanilla.patch b/ldiskfs/kernel_patches/patches/iopen-2.6.22-vanilla.patch
index 28ccd9a..9b73784 100644 (file)
--- a/ldiskfs/kernel_patches/patches/iopen-2.6.22-vanilla.patch
+++ b/ldiskfs/kernel_patches/patches/iopen-2.6.22-vanilla.patch
@@ -1,7 +1,7 @@
-Index: linux-2.6.16.27-0.9/fs/ext3/iopen.c
+Index: linux-2.6.22.15/fs/ext3/iopen.c
 ===================================================================
---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.16.27-0.9/fs/ext3/iopen.c        2007-06-29 08:33:12.000000000 +0200
+--- /dev/null
++++ linux-2.6.22.15/fs/ext3/iopen.c
 @@ -0,0 +1,256 @@
 +/*
 + * linux/fs/ext3/iopen.c
@@ -259,10 +259,10 @@ Index: linux-2.6.16.27-0.9/fs/ext3/iopen.c
 +
 +      return 1;
 +}
-Index: linux-2.6.16.27-0.9/fs/ext3/iopen.h
+Index: linux-2.6.22.15/fs/ext3/iopen.h
 ===================================================================
---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.16.27-0.9/fs/ext3/iopen.h        2007-06-29 08:24:49.000000000 +0200
+--- /dev/null
++++ linux-2.6.22.15/fs/ext3/iopen.h
 @@ -0,0 +1,19 @@
 +/*
 + * iopen.h
@@ -283,10 +283,10 @@ Index: linux-2.6.16.27-0.9/fs/ext3/iopen.h
 +#if !defined(HAVE_D_MOVE_LOCKED) && defined(HAVE___D_MOVE)
 +#define d_move_locked(dentry, target) __d_move(dentry, target)
 +#endif
-Index: linux-2.6.16.27-0.9/fs/ext3/inode.c
+Index: linux-2.6.22.15/fs/ext3/inode.c
 ===================================================================
---- linux-2.6.16.27-0.9.orig/fs/ext3/inode.c   2007-06-29 08:24:48.000000000 +0200
-+++ linux-2.6.16.27-0.9/fs/ext3/inode.c        2007-06-29 08:24:52.000000000 +0200
+--- linux-2.6.22.15.orig/fs/ext3/inode.c
++++ linux-2.6.22.15/fs/ext3/inode.c
 @@ -37,6 +37,7 @@
  #include <linux/uio.h>
  #include <linux/bio.h>
@@ -295,7 +295,7 @@ Index: linux-2.6.16.27-0.9/fs/ext3/inode.c
  #include "acl.h"
  
  static int ext3_writepage_trans_blocks(struct inode *inode);
-@@ -2448,6 +2449,8 @@ void ext3_read_inode(struct inode * inod
+@@ -2604,6 +2605,8 @@ void ext3_read_inode(struct inode * inod
        ei->i_default_acl = EXT3_ACL_NOT_CACHED;
  #endif
        ei->i_block_alloc_info = NULL;
@@ -304,11 +304,11 @@ Index: linux-2.6.16.27-0.9/fs/ext3/inode.c
  
        if (__ext3_get_inode_loc(inode, &iloc, 0))
                goto bad_inode;
-Index: linux-2.6.16.27-0.9/fs/ext3/super.c
+Index: linux-2.6.22.15/fs/ext3/super.c
 ===================================================================
---- linux-2.6.16.27-0.9.orig/fs/ext3/super.c   2007-06-29 08:24:48.000000000 +0200
-+++ linux-2.6.16.27-0.9/fs/ext3/super.c        2007-06-29 08:24:52.000000000 +0200
-@@ -678,6 +678,7 @@ enum {
+--- linux-2.6.22.15.orig/fs/ext3/super.c
++++ linux-2.6.22.15/fs/ext3/super.c
+@@ -674,6 +674,7 @@ enum {
        Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota,
        Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_quota, Opt_noquota,
        Opt_ignore, Opt_barrier, Opt_err, Opt_resize, Opt_usrquota,
@@ -316,7 +316,7 @@ Index: linux-2.6.16.27-0.9/fs/ext3/super.c
        Opt_grpquota
  };
  
-@@ -726,6 +727,9 @@ static match_table_t tokens = {
+@@ -723,6 +724,9 @@ static match_table_t tokens = {
        {Opt_noquota, "noquota"},
        {Opt_quota, "quota"},
        {Opt_usrquota, "usrquota"},
@@ -326,7 +326,7 @@ Index: linux-2.6.16.27-0.9/fs/ext3/super.c
        {Opt_barrier, "barrier=%u"},
        {Opt_err, NULL},
        {Opt_resize, "resize"},
-@@ -1040,6 +1044,18 @@ clear_qf_name:
+@@ -1038,6 +1042,18 @@ clear_qf_name:
                        else
                                clear_opt(sbi->s_mount_opt, BARRIER);
                        break;
@@ -345,10 +345,10 @@ Index: linux-2.6.16.27-0.9/fs/ext3/super.c
                case Opt_ignore:
                        break;
                case Opt_resize:
-Index: linux-2.6.16.27-0.9/fs/ext3/namei.c
+Index: linux-2.6.22.15/fs/ext3/namei.c
 ===================================================================
---- linux-2.6.16.27-0.9.orig/fs/ext3/namei.c   2007-06-29 08:24:47.000000000 +0200
-+++ linux-2.6.16.27-0.9/fs/ext3/namei.c        2007-06-29 08:24:49.000000000 +0200
+--- linux-2.6.22.15.orig/fs/ext3/namei.c
++++ linux-2.6.22.15/fs/ext3/namei.c
 @@ -39,6 +39,7 @@
  
  #include "namei.h"
@@ -357,7 +357,7 @@ Index: linux-2.6.16.27-0.9/fs/ext3/namei.c
  #include "acl.h"
  
  /*
-@@ -1004,6 +1005,9 @@ static struct dentry *ext3_lookup(struct
+@@ -1047,6 +1048,9 @@ static struct dentry *ext3_lookup(struct
        if (dentry->d_name.len > EXT3_NAME_LEN)
                return ERR_PTR(-ENAMETOOLONG);
  
@@ -367,16 +367,17 @@ Index: linux-2.6.16.27-0.9/fs/ext3/namei.c
        bh = ext3_find_entry(dentry, &de);
        inode = NULL;
        if (bh) {
-@@ -1014,7 +1018,7 @@ static struct dentry *ext3_lookup(struct
+@@ -1062,7 +1066,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);
  }
  
  
-@@ -2058,10 +2062,6 @@ static int ext3_rmdir (struct inode * di
+@@ -2123,10 +2128,6 @@ static int ext3_rmdir (struct inode * di
                              inode->i_nlink);
        inode->i_version++;
        clear_nlink(inode);
@@ -387,7 +388,7 @@ Index: linux-2.6.16.27-0.9/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);
-@@ -2185,6 +2185,23 @@ out_stop:
+@@ -2250,6 +2251,23 @@ out_stop:
        return err;
  }
  
@@ -411,8 +412,8 @@ Index: linux-2.6.16.27-0.9/fs/ext3/namei.c
  static int ext3_link (struct dentry * old_dentry,
                struct inode * dir, struct dentry *dentry)
  {
-@@ -2208,7 +2225,8 @@ retry:
-       ext3_inc_count(handle, inode);
+@@ -2279,7 +2297,8 @@ retry:
+       inc_nlink(inode);
        atomic_inc(&inode->i_count);
  
 -      err = ext3_add_nondir(handle, dentry, inode);
@@ -421,10 +422,10 @@ Index: linux-2.6.16.27-0.9/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.16.27-0.9/fs/ext3/Makefile
+Index: linux-2.6.22.15/fs/ext3/Makefile
 ===================================================================
---- linux-2.6.16.27-0.9.orig/fs/ext3/Makefile  2007-03-13 00:56:52.000000000 +0100
-+++ linux-2.6.16.27-0.9/fs/ext3/Makefile       2007-06-29 08:24:49.000000000 +0200
+--- linux-2.6.22.15.orig/fs/ext3/Makefile
++++ linux-2.6.22.15/fs/ext3/Makefile
 @@ -4,7 +4,7 @@
  
  obj-$(CONFIG_EXT3_FS) += ext3.o
@@ -434,11 +435,11 @@ Index: linux-2.6.16.27-0.9/fs/ext3/Makefile
           ioctl.o namei.o super.o symlink.o hash.o resize.o ext3_jbd.o
  
  ext3-$(CONFIG_EXT3_FS_XATTR)   += xattr.o xattr_user.o xattr_trusted.o
-Index: linux-2.6.16.27-0.9/include/linux/ext3_fs.h
+Index: linux-2.6.22.15/include/linux/ext3_fs.h
 ===================================================================
---- linux-2.6.16.27-0.9.orig/include/linux/ext3_fs.h   2007-06-29 08:24:47.000000000 +0200
-+++ linux-2.6.16.27-0.9/include/linux/ext3_fs.h        2007-06-29 08:24:49.000000000 +0200
-@@ -375,6 +375,8 @@ struct ext3_inode {
+--- linux-2.6.22.15.orig/include/linux/ext3_fs.h
++++ linux-2.6.22.15/include/linux/ext3_fs.h
+@@ -384,6 +384,8 @@ struct ext3_inode {
  #define EXT3_MOUNT_QUOTA              0x80000 /* Some quota option set */
  #define EXT3_MOUNT_USRQUOTA           0x100000 /* "old" user quota */
  #define EXT3_MOUNT_GRPQUOTA           0x200000 /* "old" group quota */
Lustre primary development and releases