From owner-svn-src-all@FreeBSD.ORG  Wed Jun 10 13:59:06 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5426210656BD;
	Wed, 10 Jun 2009 13:59:06 +0000 (UTC)
	(envelope-from lulf@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 41EAE8FC21;
	Wed, 10 Jun 2009 13:59:06 +0000 (UTC)
	(envelope-from lulf@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 n5ADx6cK015533;
	Wed, 10 Jun 2009 13:59:06 GMT (envelope-from lulf@svn.freebsd.org)
Received: (from lulf@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5ADx6vp015531;
	Wed, 10 Jun 2009 13:59:06 GMT (envelope-from lulf@svn.freebsd.org)
Message-Id: <200906101359.n5ADx6vp015531@svn.freebsd.org>
From: Ulf Lilleengen <lulf@FreeBSD.org>
Date: Wed, 10 Jun 2009 13:59:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193920 - stable/7/sbin/fsck_ffs
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Jun 2009 13:59:07 -0000

Author: lulf
Date: Wed Jun 10 13:59:05 2009
New Revision: 193920
URL: http://svn.freebsd.org/changeset/base/193920

Log:
  MFC r193059:
  - Use sig_atomic_t for signal handler variables.
  
  MFC r193325:
  - Use volatile for signal variables.
  
  MFC r193372:
  Correct comment.

Modified:
  stable/7/sbin/fsck_ffs/   (props changed)
  stable/7/sbin/fsck_ffs/fsck.h
  stable/7/sbin/fsck_ffs/gjournal.c

Modified: stable/7/sbin/fsck_ffs/fsck.h
==============================================================================
--- stable/7/sbin/fsck_ffs/fsck.h	Wed Jun 10 13:57:36 2009	(r193919)
+++ stable/7/sbin/fsck_ffs/fsck.h	Wed Jun 10 13:59:05 2009	(r193920)
@@ -297,8 +297,8 @@ int	lfmode;			/* lost & found directory 
 ufs2_daddr_t n_blks;		/* number of blocks in use */
 ino_t n_files;			/* number of files in use */
 
-int	got_siginfo;		/* received a SIGINFO */
-int	got_sigalarm;		/* received a SIGALRM */
+volatile sig_atomic_t	got_siginfo;	/* received a SIGINFO */
+volatile sig_atomic_t	got_sigalarm;	/* received a SIGALRM */
 
 #define	clearinode(dp) \
 	if (sblock.fs_magic == FS_UFS1_MAGIC) { \

Modified: stable/7/sbin/fsck_ffs/gjournal.c
==============================================================================
--- stable/7/sbin/fsck_ffs/gjournal.c	Wed Jun 10 13:57:36 2009	(r193919)
+++ stable/7/sbin/fsck_ffs/gjournal.c	Wed Jun 10 13:59:05 2009	(r193920)
@@ -672,7 +672,7 @@ gjournal_check(const char *filesys)
 
 	devnam = filesys;
 	getdisk();
-	/* Are there any unreferenced inodes in this cylinder group? */
+	/* Are there any unreferenced inodes in this file system? */
 	if (fs->fs_unrefs == 0) {
 		//printf("No unreferenced inodes.\n");
 		closedisk();