PERFORCE change 216630 for review

[Zheng Liu]

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

Change 216630 by lz at 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>