Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
landing b_cmobd_merge on HEAD
[fs/lustre-release.git]
/
lustre
/
kernel_patches
/
patches
/
ext3-htree.patch
diff --git
a/lustre/kernel_patches/patches/ext3-htree.patch
b/lustre/kernel_patches/patches/ext3-htree.patch
index
1c1c1ad
..
903118b
100644
(file)
--- a/
lustre/kernel_patches/patches/ext3-htree.patch
+++ b/
lustre/kernel_patches/patches/ext3-htree.patch
@@
-1657,8
+1657,8
@@
+ data1 = bh2->b_data;
+
+ /* The 0th block becomes the root, move the dirents out */
+ data1 = bh2->b_data;
+
+ /* The 0th block becomes the root, move the dirents out */
-+ de = (struct ext3_dir_entry_2 *)
&root->dotdot;
-+ de = (struct ext3_dir_entry_2 *)
((char *)de + de->rec_len
);
++ de = (struct ext3_dir_entry_2 *)&root->dotdot;
++ de = (struct ext3_dir_entry_2 *)
((char *)de + le16_to_cpu(de->rec_len)
);
+ len = ((char *) root) + blocksize - (char *) de;
+ memcpy (data1, de, len);
+ de = (struct ext3_dir_entry_2 *) data1;
+ len = ((char *) root) + blocksize - (char *) de;
+ memcpy (data1, de, len);
+ de = (struct ext3_dir_entry_2 *) data1;