merge b_devel into HEAD, which will become 0.7.3

[fs/lustre-release.git] / lustre / kernel_patches / patches / extN-noread.patch

diff --git a/lustre/kernel_patches/patches/extN-noread.patch b/lustre/kernel_patches/patches/extN-noread.patch
index 63f4463..305f6fd 100644 (file)
--- a/lustre/kernel_patches/patches/extN-noread.patch
+++ b/lustre/kernel_patches/patches/extN-noread.patch
@@ -83,9 +83,7 @@
                DQUOT_DROP(inode);
 --- linux-2.4.18-chaos52/fs/ext3/inode.c~extN-noread   2003-05-16 12:26:29.000000000 +0800
 +++ linux-2.4.18-chaos52-root/fs/ext3/inode.c  2003-05-16 12:27:06.000000000 +0800
-@@ -2011,23 +2011,28 @@ out_stop:
-       ext3_journal_stop(handle, inode);
- }
+@@ -2013,21 +2013,26 @@ out_stop:
  
 -/* 
 - * ext3_get_inode_loc returns with an extra refcount against the