From owner-p4-projects@FreeBSD.ORG  Mon Jun 12 21:18:31 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2926116A473; Mon, 12 Jun 2006 21:18:31 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id E0B9416A41F
	for <perforce@freebsd.org>; Mon, 12 Jun 2006 21:18:30 +0000 (UTC)
	(envelope-from trhodes@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id AA76943D55
	for <perforce@freebsd.org>; Mon, 12 Jun 2006 21:18:30 +0000 (GMT)
	(envelope-from trhodes@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5CLGEfk018896
	for <perforce@freebsd.org>; Mon, 12 Jun 2006 21:16:14 GMT
	(envelope-from trhodes@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5CLGElR018893
	for perforce@freebsd.org; Mon, 12 Jun 2006 21:16:14 GMT
	(envelope-from trhodes@freebsd.org)
Date: Mon, 12 Jun 2006 21:16:14 GMT
Message-Id: <200606122116.k5CLGElR018893@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	trhodes@freebsd.org using -f
From: Tom Rhodes <trhodes@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 99083 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, 12 Jun 2006 21:18:31 -0000

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

Change 99083 by trhodes@trhodes_local on 2006/06/12 21:15:41

	Wrap four data corruption calls to panic() in vfs_oeaction().

Affected files ...

.. //depot/projects/trhodesbsd/src/sys/fs/msdosfs/msdosfs_vnops.c#2 edit

Differences ...

==== //depot/projects/trhodesbsd/src/sys/fs/msdosfs/msdosfs_vnops.c#2 (text+ko) ====

@@ -1176,7 +1176,10 @@
 		zp->de_fndoffset = from_diroffset;
 		error = removede(zp, ip);
 		if (error) {
-			/* XXX should downgrade to ro here, fs is corrupt */
+			vfs_oeaction(fvp->v_mount, "File system corruption " \
+			    "detected");
+			    brelse(bp);
+			    VOP_UNLOCK(fvp, 0, td);
 			if (newparent)
 				VOP_UNLOCK(fdvp, 0, td);
 			VOP_UNLOCK(fvp, 0, td);
@@ -1186,7 +1189,10 @@
 			error = pcbmap(dp, de_cluster(pmp, to_diroffset), 0,
 				       &ip->de_dirclust, 0);
 			if (error) {
-				/* XXX should downgrade to ro here, fs is corrupt */
+				vfs_oeaction(fvp->v_mount, "File system corruption " \
+				    "detected");
+				    brelse(bp);
+				    VOP_UNLOCK(fvp, 0, td);
 				if (newparent)
 					VOP_UNLOCK(fdvp, 0, td);
 				VOP_UNLOCK(fvp, 0, td);
@@ -1216,7 +1222,10 @@
 		error = bread(pmp->pm_devvp, bn, pmp->pm_bpcluster,
 			      NOCRED, &bp);
 		if (error) {
-			/* XXX should downgrade to ro here, fs is corrupt */
+			vfs_oeaction(fvp->v_mount, "File system corruption " \
+			    "detected");
+			    brelse(bp);
+			    VOP_UNLOCK(fvp, 0, td);
 			brelse(bp);
 			VOP_UNLOCK(fvp, 0, td);
 			goto bad;
@@ -1227,7 +1236,10 @@
 			putushort(dotdotp->deHighClust, dp->de_StartCluster >> 16);
 		error = bwrite(bp);
 		if (error) {
-			/* XXX should downgrade to ro here, fs is corrupt */
+			vfs_oeaction(fvp->v_mount, "File system corruption " \
+			    "detected");
+			    brelse(bp);
+			    VOP_UNLOCK(fvp, 0, td);
 			VOP_UNLOCK(fvp, 0, td);
 			goto bad;
 		}