From owner-p4-projects@FreeBSD.ORG  Thu Jul  2 16:17:22 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1139E1065672; Thu,  2 Jul 2009 16:17: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 C58F2106566C
	for <perforce@FreeBSD.org>; Thu,  2 Jul 2009 16:17:21 +0000 (UTC)
	(envelope-from truncs@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id B3DC28FC13
	for <perforce@FreeBSD.org>; Thu,  2 Jul 2009 16:17:21 +0000 (UTC)
	(envelope-from truncs@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n62GHLQ0013502
	for <perforce@FreeBSD.org>; Thu, 2 Jul 2009 16:17:21 GMT
	(envelope-from truncs@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n62GHLIh013500
	for perforce@freebsd.org; Thu, 2 Jul 2009 16:17:21 GMT
	(envelope-from truncs@FreeBSD.org)
Date: Thu, 2 Jul 2009 16:17:21 GMT
Message-Id: <200907021617.n62GHLIh013500@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	truncs@FreeBSD.org using -f
From: Aditya Sarawgi <truncs@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 165545 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
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: Thu, 02 Jul 2009 16:17:22 -0000

http://perforce.freebsd.org/chv.cgi?CH=165545

Change 165545 by truncs@aditya on 2009/07/02 16:17:10

	ext2_hashalloc is also used to find both a free inode and a free block.

Affected files ...

.. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_alloc.c#23 edit

Differences ...

==== //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_alloc.c#23 (text+ko) ====

@@ -57,7 +57,7 @@
 static u_long	ext2_dirpref(struct m_ext2fs *);
 static void	ext2_fserr(struct m_ext2fs *, u_int, char *);
 static struct ext2_gd *	 get_group_desc2(struct m_ext2fs *, int, struct buf **);
-static ino_t	ext2_hashalloc(struct inode *, int, long, int,
+static u_long	ext2_hashalloc(struct inode *, int, long, int,
 				daddr_t (*)(struct inode *, int, daddr_t, 
 						int));
 static daddr_t	ext2_nodealloccg(struct inode *, int, daddr_t, int);
@@ -395,7 +395,7 @@
 		cg = ino_to_cg(fs, pip->i_number);
 	ipref = cg * fs->e2fs->e2fs_ipg + 1;
 	uprintf("b\n");
-        ino = ext2_hashalloc(pip, cg, (long)ipref, mode, ext2_nodealloccg);
+        ino = (ino_t)ext2_hashalloc(pip, cg, (long)ipref, mode, ext2_nodealloccg);
 	uprintf("c\n");
 
 	if (ino == 0) 
@@ -621,7 +621,7 @@
  *   2) quadradically rehash on the cylinder group number.
  *   3) brute force search for a free block.
  */
-static ino_t
+static u_long
 ext2_hashalloc(struct inode *ip, int cg, long pref, int size,
                 daddr_t (*allocator)(struct inode *, int, daddr_t, int))
 {