From owner-p4-projects@FreeBSD.ORG  Tue Aug 28 16:31:22 2012
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 75F241065673; Tue, 28 Aug 2012 16:31:22 +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 38A2F106564A
	for <perforce@FreeBSD.org>; Tue, 28 Aug 2012 16:31:22 +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 21D158FC08
	for <perforce@FreeBSD.org>; Tue, 28 Aug 2012 16:31:22 +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 q7SGVLe0076056
	for <perforce@FreeBSD.org>; Tue, 28 Aug 2012 16:31:21 GMT
	(envelope-from lz@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q7SGVLoP076053
	for perforce@freebsd.org; Tue, 28 Aug 2012 16:31:21 GMT
	(envelope-from lz@FreeBSD.org)
Date: Tue, 28 Aug 2012 16:31:21 GMT
Message-Id: <201208281631.q7SGVLoP076053@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	lz@FreeBSD.org using -f
From: Zheng Liu <lz@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 216630 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Aug 2012 16:31:22 -0000

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

Change 216630 by lz@gnehzuil-desktop on 2012/08/28 16:30:45

	Some hash functions are defined for htree directory index according
	to NetBSD's version.

Affected files ...

.. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_dinode.h#7 edit
.. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_extern.h#8 edit
.. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_hash.c#5 add
.. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/htree.h#5 add
.. //depot/projects/soc2010/extfs/src/sys/modules/ext2fs/Makefile#5 edit

Differences ...

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

@@ -72,7 +72,7 @@
 #define E2DI_HAS_XTIME(ip)	(EXT2_INODE_SIZE((ip)->i_e2fs) > \
 				    E2FS_REV0_INODE_SIZE)
 
-#define EXT2_INDEX		0x00001000	/* Hash-indexed directory */
+#define EXT2_DIR_INDEX		0x00001000	/* Hash-indexed directory */
 
 /*
  * Structure of an inode on the disk

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

@@ -82,6 +82,10 @@
 int	cg_has_sb(int i);
 int	ext2_inactive(struct vop_inactive_args *);
 
+/* ext2_hash.c */
+int	ext2_htree_hash(const char *, int, uint32_t *, int,
+	    uint32_t *, uint32_t *);
+
 /* Flags to low-level allocation routines.
  * The low 16-bits are reserved for IO_ flags from vnode.h.
  */

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

@@ -4,7 +4,7 @@
 KMOD=	ext2fs
 SRCS=	opt_ddb.h opt_directio.h opt_quota.h opt_suiddir.h vnode_if.h \
 	ext2_alloc.c ext2_balloc.c ext2_bmap.c ext2_hash.c \
-	ext2_htree.c ext2_inode.c ext2_inode_cnv.c ext2_lookup.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>