From owner-p4-projects@FreeBSD.ORG  Fri Jul  3 19:21:31 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 865AD1065675; Fri,  3 Jul 2009 19:21:31 +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 4623F1065672
	for <perforce@FreeBSD.org>; Fri,  3 Jul 2009 19:21:31 +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 34C148FC14
	for <perforce@FreeBSD.org>; Fri,  3 Jul 2009 19:21:31 +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 n63JLV38028827
	for <perforce@FreeBSD.org>; Fri, 3 Jul 2009 19:21:31 GMT
	(envelope-from truncs@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n63JLVY1028825
	for perforce@freebsd.org; Fri, 3 Jul 2009 19:21:31 GMT
	(envelope-from truncs@FreeBSD.org)
Date: Fri, 3 Jul 2009 19:21:31 GMT
Message-Id: <200907031921.n63JLVY1028825@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 165574 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: Fri, 03 Jul 2009 19:21:32 -0000

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

Change 165574 by truncs@aditya on 2009/07/03 19:20:53

	Introducing ext2_hashalloc and ext2_alloccg to find a new block. Currently preallocation is not implemented and preallocation.

Affected files ...

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

Differences ...

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

@@ -107,7 +107,7 @@
 {
 	struct m_ext2fs *fs;
 	int32_t bno;
-	
+	int cg;	
 	*bnp = 0;
 	fs = ip->i_e2fs;
 #ifdef DIAGNOSTIC
@@ -126,7 +126,21 @@
 		goto nospace;
 	if (bpref >= fs->e2fs->e2fs_bcount)
 		bpref = 0;
-	/* call the Linux code */
+	 if (bpref == 0)
+                cg = ino_to_cg(fs, ip->i_number);
+        else
+                cg = dtog(fs, bpref);
+        bno = (daddr_t)ext2_hashalloc(ip, cg, bpref, fs->e2fs_bsize,
+                                                 ext2_alloccg);
+        if (bno > 0) {
+                ip->i_blocks += btodb(fs->e2fs_bsize);
+                ip->i_flag |= IN_CHANGE | IN_UPDATE;
+                *bnp = bno;
+                return (0);
+        }
+
+
+#ifdef notused
 #ifdef EXT2_PREALLOCATE
 	/* To have a preallocation hit, we must
 	 * - have at least one block preallocated
@@ -171,6 +185,7 @@
 		*bnp = bno;
 		return (0);
 	}
+#endif
 nospace:
 	ext2_fserr(fs, cred->cr_uid, "file system full");
 	uprintf("\n%s: write failed, file system is full\n", fs->e2fs_fsmnt);
@@ -727,7 +742,6 @@
 
 	bno = ext2_mapsearch(fs, bbp, bpref);
 	if (bno < 0){
-		unlock_super(DEVVP(ip));
 		return (0);
 	}
 gotit: