From owner-p4-projects@FreeBSD.ORG  Mon Jun 29 20:28:46 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A15591065678; Mon, 29 Jun 2009 20:28:46 +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 61A6D1065674
	for <perforce@FreeBSD.org>; Mon, 29 Jun 2009 20:28:46 +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 504778FC0A
	for <perforce@FreeBSD.org>; Mon, 29 Jun 2009 20:28:46 +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 n5TKSkWC074484
	for <perforce@FreeBSD.org>; Mon, 29 Jun 2009 20:28:46 GMT
	(envelope-from truncs@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n5TKSkGK074482
	for perforce@freebsd.org; Mon, 29 Jun 2009 20:28:46 GMT
	(envelope-from truncs@FreeBSD.org)
Date: Mon, 29 Jun 2009 20:28:46 GMT
Message-Id: <200906292028.n5TKSkGK074482@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 165438 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: Mon, 29 Jun 2009 20:28:47 -0000

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

Change 165438 by truncs@aditya on 2009/06/29 20:28:02

	Freeing an inode implementation.

Affected files ...

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

Differences ...

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

@@ -517,7 +517,11 @@
 {
 	struct m_ext2fs *fs;
 	struct inode *pip;
-	mode_t save_i_mode;
+	struct buf *bp;
+	struct ext2_gd * gdp = NULL;
+	int error, cg;
+	char * ibp;
+/*	mode_t save_i_mode; */
 
 	pip = VTOI(pvp);
 	fs = pip->i_e2fs;
@@ -534,10 +538,35 @@
 	   really like to know what the rationale behind this
 	   'set i_mode to zero to denote an unused inode' is
 	 */
-	save_i_mode = pip->i_mode;
+/*	save_i_mode = pip->i_mode;
 	pip->i_mode = mode;
 	ext2_free_inode(pip);	
-	pip->i_mode = save_i_mode;
+	pip->i_mode = save_i_mode; */
+	cg = ino_to_cg(fs, ino);
+	gdp = get_group_desc2(fs, cg, NULL);
+	error = bread(pip->i_devvp,
+		fsbtodb(fs, gdp->ext2bgd_i_bitmap),
+		(int)fs->e2fs_bsize, NOCRED, &bp);
+	if (error) {
+		brelse(bp);
+		return (0);
+	}
+	ibp = (char *)bp->b_data;
+	ino = (ino - 1) % fs->e2fs->e2fs_ipg;
+	if (isclr(ibp, ino)) {
+		printf("ino = %llu, fs = %s\n",
+			 (unsigned long long)ino, fs->e2fs_fsmnt);
+		if (fs->e2fs_ronly == 0)
+			panic("ifree: freeing free inode");
+	}
+	clrbit(ibp, ino);
+	fs->e2fs->e2fs_ficount++;
+	gdp->ext2bgd_nifree++;
+	if ((mode & IFMT) == IFDIR) {
+		gdp->ext2bgd_ndirs--;
+	}
+	fs->e2fs_fmod = 1;
+	bdwrite(bp);
 	return (0);
 }