From owner-p4-projects@FreeBSD.ORG  Fri Jun 26 20:57:48 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 44C421065673; Fri, 26 Jun 2009 20:57:48 +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 041A61065670
	for <perforce@FreeBSD.org>; Fri, 26 Jun 2009 20:57:48 +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 E60298FC12
	for <perforce@FreeBSD.org>; Fri, 26 Jun 2009 20:57:47 +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 n5QKvlIf080535
	for <perforce@FreeBSD.org>; Fri, 26 Jun 2009 20:57:47 GMT
	(envelope-from truncs@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n5QKvlkQ080533
	for perforce@freebsd.org; Fri, 26 Jun 2009 20:57:47 GMT
	(envelope-from truncs@FreeBSD.org)
Date: Fri, 26 Jun 2009 20:57:47 GMT
Message-Id: <200906262057.n5QKvlkQ080533@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 165288 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, 26 Jun 2009 20:57:49 -0000

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

Change 165288 by truncs@aditya on 2009/06/26 20:57:45

	Super block locking.

Affected files ...

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

Differences ...

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

@@ -635,11 +635,13 @@
 	fs = ip->i_e2fs;
 	if (fs->e2fs_gd[cg].ext2bgd_nbfree == 0)
 		return (0);
+	lock_super(DEVVP(ip));
 	error = bread(ip->i_devvp, fsbtodb(fs,
 		fs->e2fs_gd[cg].ext2bgd_b_bitmap),
 		(int)fs->e2fs_bsize, NOCRED, &bp);
 	if (error) {
 		brelse(bp);
+		unlock_super(DEVVP(ip));
 		return (0);
 	}
 	bbp = (char *)bp->b_data;
@@ -681,8 +683,10 @@
 	}
 
 	bno = ext2fs_mapsearch(fs, bbp, bpref);
-	if (bno < 0)
+	if (bno < 0){
+		unlock_super(DEVVP(ip));
 		return (0);
+	}
 gotit:
 #ifdef DIAGNOSTIC
 	if (isset(bbp, (daddr_t)bno)) {
@@ -696,7 +700,7 @@
 	fs->e2fs_gd[cg].ext2bgd_nbfree--;
 	mark_buffer_dirty(bp);
 	fs->e2fs_fmod = 1;
-	
+	unlock_super(DEVVP(ip));
 	return (cg * fs->e2fs.e2fs_fpg + fs->e2fs.e2fs_first_dblock + bno);
 }
 
@@ -720,11 +724,13 @@
 	fs = ip->i_e2fs;
 	if (fs->e2fs_gd[cg].ext2bgd_nifree == 0)
 		return (0);
+	lock_super(DEVVP(ip));
 	error = bread(ip->i_devvp, fsbtodb(fs,
 		fs->e2fs_gd[cg].ext2bgd_i_bitmap),
 		(int)fs->e2fs_bsize, NOCRED, &bp);
 	if (error) {
 		brelse(bp);
+		unlock_super(DEVVP(ip));
 		return (0);
 	}
 	ibp = (char *)bp->b_data;
@@ -757,6 +763,7 @@
 		fs->e2fs_gd[cg].ext2bgd_ndirs++;
 	}
 	mark_buffer_dirty(bp);
+	unlock_buffer(DEVVP(ip));
 	return (cg * fs->e2fs.e2fs_ipg + ipref +1);
 }