From owner-p4-projects@FreeBSD.ORG  Wed Aug 29 16:49:39 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id AEEC616A41B; Wed, 29 Aug 2007 16:49:39 +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 711AF16A418
	for <perforce@freebsd.org>; Wed, 29 Aug 2007 16:49:39 +0000 (UTC)
	(envelope-from delphij@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 6119813C428
	for <perforce@freebsd.org>; Wed, 29 Aug 2007 16:49:39 +0000 (UTC)
	(envelope-from delphij@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l7TGndNh089985
	for <perforce@freebsd.org>; Wed, 29 Aug 2007 16:49:39 GMT
	(envelope-from delphij@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l7TGncOd089982
	for perforce@freebsd.org; Wed, 29 Aug 2007 16:49:38 GMT
	(envelope-from delphij@freebsd.org)
Date: Wed, 29 Aug 2007 16:49:38 GMT
Message-Id: <200708291649.l7TGncOd089982@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	delphij@freebsd.org using -f
From: Xin LI <delphij@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 125823 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: Wed, 29 Aug 2007 16:49:40 -0000

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

Change 125823 by delphij@charlie on 2007/08/29 16:49:25

	During umount(), we could bail out because the clean flag was failed
	to write.  We have to do this *before* freeing iconv stuff, restoring
	the pre-umount state is not trivial.
	
	Submitted by:	bde

Affected files ...

.. //depot/projects/delphij_fork/sys/fs/msdosfs/msdosfs_vfsops.c#7 edit

Differences ...

==== //depot/projects/delphij_fork/sys/fs/msdosfs/msdosfs_vfsops.c#7 (text+ko) ====

@@ -766,6 +766,15 @@
 	if (error)
 		return error;
 	pmp = VFSTOMSDOSFS(mp);
+
+	if ((pmp->pm_flags & MSDOSFSMNT_RONLY) == 0) {
+		error = markvoldirty(pmp, 0);
+		if (error) {
+			(void)markvoldirty(pmp, 1);
+			return (error);
+		}
+	} 
+
 	if (pmp->pm_flags & MSDOSFSMNT_KICONV && msdosfs_iconv) {
 		if (pmp->pm_w2u)
 			msdosfs_iconv->close(pmp->pm_w2u);
@@ -776,13 +785,6 @@
 		if (pmp->pm_u2d)
 			msdosfs_iconv->close(pmp->pm_u2d);
 	}
-
-	/* If the volume was mounted read/write, mark it clean now. */
-	if ((pmp->pm_flags & MSDOSFSMNT_RONLY) == 0) {
-		error = markvoldirty(pmp, 0);
-		if (error && (flags & FORCECLOSE) == 0)
-			return (error);
-	}
 #ifdef MSDOSFS_DEBUG
 	{
 		struct vnode *vp = pmp->pm_devvp;