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
LU-4708 ldiskfs: do not copy NUL terminator from direntry
[fs/lustre-release.git]
/
ldiskfs
/
kernel_patches
/
patches
/
rhel6.3
/
ext4-data-in-dirent.patch
diff --git
a/ldiskfs/kernel_patches/patches/rhel6.3/ext4-data-in-dirent.patch
b/ldiskfs/kernel_patches/patches/rhel6.3/ext4-data-in-dirent.patch
index
b534162
..
ae8e51e
100644
(file)
--- a/
ldiskfs/kernel_patches/patches/rhel6.3/ext4-data-in-dirent.patch
+++ b/
ldiskfs/kernel_patches/patches/rhel6.3/ext4-data-in-dirent.patch
@@
-57,7
+57,7
@@
changes in ext4_add_entry() interface required.
struct fname *fname, *new_fn;
struct dir_private_info *info;
int len;
struct fname *fname, *new_fn;
struct dir_private_info *info;
int len;
-+ int extra_data =
1
;
++ int extra_data =
0
;
info = (struct dir_private_info *) dir_file->private_data;
p = &info->root.rb_node;
info = (struct dir_private_info *) dir_file->private_data;
p = &info->root.rb_node;
@@
-67,7
+67,7
@@
changes in ext4_add_entry() interface required.
+ if (dirent->file_type & EXT4_DIRENT_LUFID)
+ extra_data = ext4_get_dirent_data_len(dirent);
+
+ if (dirent->file_type & EXT4_DIRENT_LUFID)
+ extra_data = ext4_get_dirent_data_len(dirent);
+
-+ len = sizeof(struct fname) + dirent->name_len + extra_data;
++ len = sizeof(struct fname) + dirent->name_len + extra_data
+ 1
;
+
new_fn = kzalloc(len, GFP_KERNEL);
if (!new_fn)
+
new_fn = kzalloc(len, GFP_KERNEL);
if (!new_fn)