landing b_cmobd_merge on HEAD

[fs/lustre-release.git] / lustre / kernel_patches / patches / ext3-use-after-free-suse.patch

diff --git a/lustre/kernel_patches/patches/ext3-use-after-free-suse.patch b/lustre/kernel_patches/patches/ext3-use-after-free-suse.patch
index 1dab6d8..5a5dc5a 100644 (file)
--- a/lustre/kernel_patches/patches/ext3-use-after-free-suse.patch
+++ b/lustre/kernel_patches/patches/ext3-use-after-free-suse.patch
@@ -1,11 +1,11 @@
  ./fs/ext3/namei.c |   11 +++++------
  1 files changed, 5 insertions(+), 6 deletions(-)
 
-Index: linux-2.4.19.SuSE/./fs/ext3/namei.c
+Index: linux-2.4.19/fs/ext3/namei.c
 ===================================================================
---- linux-2.4.19.SuSE.orig/./fs/ext3/namei.c   Sun Nov 16 01:02:51 2003
-+++ linux-2.4.19.SuSE/./fs/ext3/namei.c        Sun Nov 16 01:14:50 2003
-@@ -1523,8 +1523,11 @@
+--- linux-2.4.19.orig/fs/ext3/namei.c  2004-04-23 22:30:41.000000000 -0400
++++ linux-2.4.19/fs/ext3/namei.c       2004-04-23 22:36:03.000000000 -0400
+@@ -1522,8 +1522,11 @@
  {
        int err = ext3_add_entry(handle, dentry, inode);
        if (!err) {
@@ -19,7 +19,7 @@ Index: linux-2.4.19.SuSE/./fs/ext3/namei.c
        }
        ext3_dec_count(handle, inode);
        iput(inode);
-@@ -1560,7 +1563,6 @@
+@@ -1559,7 +1562,6 @@
                inode->i_op = &ext3_file_inode_operations;
                inode->i_fop = &ext3_file_operations;
                inode->i_mapping->a_ops = &ext3_aops;
@@ -27,7 +27,7 @@ Index: linux-2.4.19.SuSE/./fs/ext3/namei.c
                err = ext3_add_nondir(handle, dentry, inode);
        }
        ext3_journal_stop(handle, dir);
-@@ -1590,7 +1592,6 @@
+@@ -1589,7 +1591,6 @@
  #ifdef CONFIG_EXT3_FS_XATTR
                inode->i_op = &ext3_special_inode_operations;
  #endif
@@ -38,7 +38,7 @@ Index: linux-2.4.19.SuSE/./fs/ext3/namei.c
 @@ -2039,7 +2040,6 @@
                inode->i_size = l-1;
        }
-       EXT3_I(inode)->i_disksize = inode->i_size;
+         EXT3_I(inode)->i_disksize = inode->i_size;
 -      ext3_mark_inode_dirty(handle, inode);
        err = ext3_add_nondir(handle, dentry, inode);
  out_stop: