From owner-svn-src-head@FreeBSD.ORG  Wed Dec 24 03:07:19 2008
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AA6171065670;
	Wed, 24 Dec 2008 03:07:19 +0000 (UTC)
	(envelope-from obrien@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 991228FC0C;
	Wed, 24 Dec 2008 03:07:19 +0000 (UTC)
	(envelope-from obrien@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mBO37J3q020985;
	Wed, 24 Dec 2008 03:07:19 GMT (envelope-from obrien@svn.freebsd.org)
Received: (from obrien@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBO37Jkq020984;
	Wed, 24 Dec 2008 03:07:19 GMT (envelope-from obrien@svn.freebsd.org)
Message-Id: <200812240307.mBO37Jkq020984@svn.freebsd.org>
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Wed, 24 Dec 2008 03:07:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r186471 - head/sbin/fsck_ffs
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 24 Dec 2008 03:07:19 -0000

Author: obrien
Date: Wed Dec 24 03:07:19 2008
New Revision: 186471
URL: http://svn.freebsd.org/changeset/base/186471

Log:
  Garbage collect 'fflags'.

Modified:
  head/sbin/fsck_ffs/main.c

Modified: head/sbin/fsck_ffs/main.c
==============================================================================
--- head/sbin/fsck_ffs/main.c	Wed Dec 24 02:46:56 2008	(r186470)
+++ head/sbin/fsck_ffs/main.c	Wed Dec 24 03:07:19 2008	(r186471)
@@ -206,7 +206,6 @@ checkfilesys(char *filesys)
 	struct iovec *iov;
 	char errmsg[255];
 	int iovlen;
-	int fflags;
 	int cylno;
 	ino_t files;
 	size_t size;
@@ -343,7 +342,6 @@ checkfilesys(char *filesys)
 		if (bkgrdflag) {
 			snprintf(snapname, sizeof snapname,
 			    "%s/.snap/fsck_snapshot", mntp->f_mntonname);
-			fflags = mntp->f_flags;
 			build_iovec(&iov, &iovlen, "fstype", "ffs", 4);
 			build_iovec(&iov, &iovlen, "from", snapname,
 			    (size_t)-1);
@@ -354,7 +352,7 @@ checkfilesys(char *filesys)
 			build_iovec(&iov, &iovlen, "update", NULL, 0);
 			build_iovec(&iov, &iovlen, "snapshot", NULL, 0);
 
-			while (nmount(iov, iovlen, fflags) < 0) {
+			while (nmount(iov, iovlen, mntp->f_flags) < 0) {
 				if (errno == EEXIST && unlink(snapname) == 0)
 					continue;
 				bkgrdflag = 0;
@@ -522,7 +520,6 @@ chkdoreload(struct statfs *mntp)
 {
 	struct iovec *iov;
 	int iovlen;
-	int fflags;
 	char errmsg[255];
 
 	if (mntp == NULL)
@@ -531,7 +528,6 @@ chkdoreload(struct statfs *mntp)
 	iov = NULL;
 	iovlen = 0;
 	errmsg[0] = '\0';
-	fflags = mntp->f_flags;
 	/*
 	 * We modified a mounted file system.  Do a mount update on
 	 * it unless it is read-write, so we can continue using it
@@ -552,7 +548,7 @@ chkdoreload(struct statfs *mntp)
 		 * nmount parsing of root mounts and NFS root mounts.
 		 */ 
 		build_iovec(&iov, &iovlen, "ro", NULL, 0);
-		if (nmount(iov, iovlen, fflags) == 0) {
+		if (nmount(iov, iovlen, mntp->f_flags) == 0) {
 			return (0);
 		}
 		pwarn("mount reload of '%s' failed: %s %s\n\n",