- merge 0.7rc1 from b_devel to HEAD (20030612 merge point)

[fs/lustre-release.git] / lustre / kernel_patches / patches / ext-2.4-patch-2.patch

diff --git a/lustre/kernel_patches/patches/ext-2.4-patch-2.patch b/lustre/kernel_patches/patches/ext-2.4-patch-2.patch
new file mode 100644 (file)
index 0000000..689d33b
--- /dev/null
+++ b/lustre/kernel_patches/patches/ext-2.4-patch-2.patch
@@ -0,0 +1,34 @@
+# This is a BitKeeper generated patch for the following project:
+# Project Name: Linux kernel tree
+#
+# namei.c |    9 +++++++++
+# 1 files changed, 9 insertions(+)
+#
+# The following is the BitKeeper ChangeSet Log
+# --------------------------------------------
+# 02/11/07     tytso@snap.thunk.org    1.777
+# Add '.' and '..' entries to be returned by readdir of htree directories
+# 
+# This patch from Chris Li adds '.' and '..' to the rbtree so that they 
+# are properly returned by readdir.
+# --------------------------------------------
+#
+diff -Nru a/fs/ext3/namei.c b/fs/ext3/namei.c
+--- a/fs/ext3/namei.c  Thu Nov  7 10:57:30 2002
++++ b/fs/ext3/namei.c  Thu Nov  7 10:57:30 2002
+@@ -546,6 +546,15 @@
+       if (!frame)
+               return err;
+ 
++      /* Add '.' and '..' from the htree header */
++      if (!start_hash && !start_minor_hash) {
++              de = (struct ext3_dir_entry_2 *) frames[0].bh->b_data;
++              ext3_htree_store_dirent(dir_file, 0, 0, de);
++              de = ext3_next_entry(de);
++              ext3_htree_store_dirent(dir_file, 0, 0, de);
++              count += 2;
++      }
++
+       while (1) {
+               block = dx_get_block(frame->at);
+               dxtrace(printk("Reading block %d\n", block));