svn commit: r203765 - stable/8/sbin/fsck_ffs

[Kirk McKusick]

Author: mckusick
Date: Wed Feb 10 20:35:20 2010
New Revision: 203765
URL: http://svn.freebsd.org/changeset/base/203765

Log:
  MFC of r201700 | mckusick | 2010-01-06
  
  This corrects a bug that manifested itself as identifying the last
  cylinder group of a UFS1 filesystem as bad. The error was in the check
  and not in the cylinder group itself. So even though fsck fixed the
  cylinder group correctly, it was still endlessly reported as bad.
  
  This bug first appeared in 8.0 so does not apply to earlier releases.
  
  PR:             141992
  Reported by:    Dan Strick

Modified:
  stable/8/sbin/fsck_ffs/fsutil.c
Directory Properties:
  stable/8/sbin/fsck_ffs/   (props changed)

Modified: stable/8/sbin/fsck_ffs/fsutil.c
==============================================================================
--- stable/8/sbin/fsck_ffs/fsutil.c	Wed Feb 10 20:17:46 2010	(r203764)
+++ stable/8/sbin/fsck_ffs/fsutil.c	Wed Feb 10 20:35:20 2010	(r203765)
@@ -436,7 +436,7 @@ check_cgmagic(int cg, struct cg *cgp)
 	    ((sblock.fs_magic == FS_UFS1_MAGIC &&
 	      cgp->cg_old_niblk == sblock.fs_ipg &&
 	      cgp->cg_ndblk <= sblock.fs_fpg &&
-	      cgp->cg_old_ncyl == sblock.fs_old_cpg) ||
+	      cgp->cg_old_ncyl <= sblock.fs_old_cpg) ||
 	     (sblock.fs_magic == FS_UFS2_MAGIC &&
 	      cgp->cg_niblk == sblock.fs_ipg &&
 	      cgp->cg_ndblk <= sblock.fs_fpg &&