From owner-p4-projects@FreeBSD.ORG  Mon Jun  8 17:48:43 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A97B3106575A; Mon,  8 Jun 2009 17:48:42 +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 60043106574C
	for <perforce@FreeBSD.org>; Mon,  8 Jun 2009 17:48:42 +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 4D3BF8FC1A
	for <perforce@FreeBSD.org>; Mon,  8 Jun 2009 17:48:42 +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 n58HmgXb098225
	for <perforce@FreeBSD.org>; Mon, 8 Jun 2009 17:48:42 GMT
	(envelope-from truncs@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n58HmgjM098223
	for perforce@freebsd.org; Mon, 8 Jun 2009 17:48:42 GMT
	(envelope-from truncs@FreeBSD.org)
Date: Mon, 8 Jun 2009 17:48:42 GMT
Message-Id: <200906081748.n58HmgjM098223@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 163810 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, 08 Jun 2009 17:48:44 -0000

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

Change 163810 by truncs@aditya on 2009/06/08 17:47:46

	integrate changes made by stas@ 

Affected files ...

.. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#6 edit

Differences ...

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

@@ -217,12 +217,12 @@
 			if ((fs->e2fs->s_state & EXT2_VALID_FS) == 0 ||
 			    (fs->e2fs->s_state & EXT2_ERROR_FS)) {
 				if (mp->mnt_flag & MNT_FORCE) {
-					printf("WARNING: %s was not properly "
-					    "dismounted\n", fs->e2fs_fsmnt);
+					printf(
+"WARNING: %s was not properly  "dismounted\n", fs->e2fs_fsmnt);
 				} else {
-					printf("WARNING: R/W mount of %s "
-					    "denied. Filesystem is not clean"
-					    " - run fsck\n", fs->e2fs_fsmnt);
+					printf(
+"WARNING: R/W mount of %s denied. Filesystem is not clean - run fsck\n",
+					 fs->e2fs_fsmnt);
 					return (EPERM);
 				}
 			}
@@ -358,8 +358,9 @@
 	}
 	if (es->s_rev_level > EXT2_GOOD_OLD_REV) {
 		if (es->s_feature_incompat & ~EXT2_FEATURE_INCOMPAT_SUPP) {
-			printf("WARNING: mount of %s denied due to unsupported "
-			    "optional features\n", devtoname(dev));
+			printf(
+"WARNING: mount of %s denied due to unsupported optional features\n",
+			    devtoname(dev));
 			return (1);
 		}
 		if (!ronly &&
@@ -628,11 +629,11 @@
 	if ((es->s_state & EXT2_VALID_FS) == 0 ||
 	    (es->s_state & EXT2_ERROR_FS)) {
 		if (ronly || (mp->mnt_flag & MNT_FORCE)) {
-			printf("WARNING: Filesystem was not properly "
-			    "dismounted\n");
+			printf(
+"WARNING: Filesystem was not properly dismounted\n");
 		} else {
-			printf("WARNING: R/W mount denied.  Filesystem "
-			    "is not clean - run fsck\n");
+			printf(
+"WARNING: R/W mount denied.  Filesystem is not clean - run fsck\n");
 			error = EPERM;
 			goto out;
 		}