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();
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
