Merge branch 'upstream-fixes'

2006-03-06 14:38:16 -05:00
parent ad8c48ad3b 2d66806d74
commit 74f5ec29ae
6 changed files with 23 additions and 20 deletions
--- a/include/linux/reiserfs_fs.h
+++ b/include/linux/reiserfs_fs.h
@@ -1052,7 +1052,7 @@ struct reiserfs_dir_entry {
 	int de_entrylen;
 	int de_namelen;
 	char *de_name;
-	char *de_gen_number_bit_string;
+	unsigned long *de_gen_number_bit_string;

 	__u32 de_dir_id;
 	__u32 de_objectid;