PERFORCE change 192129 for review

[Zheng Liu]

http://p4web.freebsd.org/@@192129?ac=10

Change 192129 by lz at freebsd-dev on 2011/04/26 11:18:35

	Rename some varibles and add ext2_hash.c into Makefile.

Affected files ...

.. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_hash.c#2 edit
.. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_hash.h#2 edit
.. //depot/projects/soc2010/extfs/src/sys/modules/ext2fs/Makefile#3 edit

Differences ...

==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_hash.c#2 (text+ko) ====

@@ -13,7 +13,7 @@
 #include <sys/stat.h>
 #include <sys/hash.h>
 
-#include <fs/ext4fs/ext4_hash.h>
+#include <fs/ext2fs/ext2_hash.h>
 
 /*
  * Constants for MD4Transform routine.
@@ -110,7 +110,7 @@
  * Tiny Encryption Algorithm.
  */
 void
-TEA_transform(u_int32_t buf[4], u_int32_t in[8])
+tea_transform(u_int32_t buf[4], u_int32_t in[8])
 {
         u_int32_t sum;
         u_int32_t x, y;
@@ -182,7 +182,7 @@
 
 /*
  * Refer Haiku's implementation. This implemention is MIT license.
- * So the kernel can not be contaminated.
+ * So the kernel can not be contaminated by GPL.
  */
 void
 str2hashbuf_unsigned(const char *str, int len, u_int32_t *buf, int num)

==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_hash.h#2 (text+ko) ====

@@ -7,15 +7,15 @@
  *      Zheng Liu
  */
 
-#ifndef _FS_EXT4FS_EXT4_HASH_H_
-#define _FS_EXT4FS_EXT4_HASH_H_
+#ifndef _FS_EXT2FS_EXT2_HASH_H_
+#define _FS_EXT2FS_EXT2_HASH_H_
 
-/* ext4_hash.c */
-u_int32_t half_md4_transform(u_int32_t [], u_int32_t []);
-void TEA_transform(u_int32_t [], u_int32_t []);
-void str2hashbuf_signed(const char *, int, u_int32_t *, int);
-void str2hashbuf_unsigned(const char *, int, u_int32_t *, int);
-u_int32_t legacy_hash_signed(const char *, int);
-u_int32_t legacy_hash_unsigned(const char *, int);
+/* ext2_hash.c */
+u_int32_t 	half_md4_transform(u_int32_t [], u_int32_t []);
+void 		tea_transform(u_int32_t [], u_int32_t []);
+void 		str2hashbuf_signed(const char *, int, u_int32_t *, int);
+void 		str2hashbuf_unsigned(const char *, int, u_int32_t *, int);
+u_int32_t 	legacy_hash_signed(const char *, int);
+u_int32_t 	legacy_hash_unsigned(const char *, int);
 
-#endif /* !_FS_EXT4FS_EXT4_HASH_H_ */
+#endif /* !_FS_EXT2FS_EXT2_HASH_H_ */

==== //depot/projects/soc2010/extfs/src/sys/modules/ext2fs/Makefile#3 (text+ko) ====

@@ -3,8 +3,8 @@
 .PATH:	${.CURDIR}/../../fs/ext2fs
 KMOD=	ext2fs
 SRCS=	opt_ddb.h opt_quota.h opt_suiddir.h vnode_if.h \
-	ext2_alloc.c ext2_balloc.c ext2_bmap.c ext2_inode.c \
-	ext2_inode_cnv.c ext2_lookup.c ext2_prealloc.c \
-	ext2_subr.c ext2_vfsops.c ext2_vnops.c
+	ext2_alloc.c ext2_balloc.c ext2_bmap.c ext2_hash.c \
+	ext2_inode.c ext2_inode_cnv.c ext2_lookup.c \
+	ext2_prealloc.c ext2_subr.c ext2_vfsops.c ext2_vnops.c
 
 .include <bsd.kmod.mk>