From owner-p4-projects@FreeBSD.ORG Tue Apr 26 11:19:18 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3ED7B1065672; Tue, 26 Apr 2011 11:19:18 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 01CF5106564A for ; Tue, 26 Apr 2011 11:19:18 +0000 (UTC) (envelope-from lz@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id CB7A58FC13 for ; Tue, 26 Apr 2011 11:19:17 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p3QBJH4u063864 for ; Tue, 26 Apr 2011 11:19:17 GMT (envelope-from lz@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p3QBJHkh063861 for perforce@freebsd.org; Tue, 26 Apr 2011 11:19:17 GMT (envelope-from lz@FreeBSD.org) Date: Tue, 26 Apr 2011 11:19:17 GMT Message-Id: <201104261119.p3QBJHkh063861@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to lz@FreeBSD.org using -f From: Zheng Liu To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 192129 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Apr 2011 11:19:18 -0000 http://p4web.freebsd.org/@@192129?ac=10 Change 192129 by lz@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 #include -#include +#include /* * 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