Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/sbin/resize_ffs/resize_ffs.c,v rcsdiff: /ftp/cvs/cvsroot/src/sbin/resize_ffs/resize_ffs.c,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.30 retrieving revision 1.31 diff -u -p -r1.30 -r1.31 --- src/sbin/resize_ffs/resize_ffs.c 2011/08/15 02:19:50 1.30 +++ src/sbin/resize_ffs/resize_ffs.c 2011/08/15 02:22:46 1.31 @@ -1,4 +1,4 @@ -/* $NetBSD: resize_ffs.c,v 1.30 2011/08/15 02:19:50 dholland Exp $ */ +/* $NetBSD: resize_ffs.c,v 1.31 2011/08/15 02:22:46 dholland Exp $ */ /* From sources sent on February 17, 2003 */ /*- * As its sole author, I explicitly place this code in the public @@ -36,7 +36,7 @@ */ #include -__RCSID("$NetBSD: resize_ffs.c,v 1.30 2011/08/15 02:19:50 dholland Exp $"); +__RCSID("$NetBSD: resize_ffs.c,v 1.31 2011/08/15 02:22:46 dholland Exp $"); #include #include @@ -1157,11 +1157,13 @@ dblk_callback(union dinode * di, unsigne fn = (mark_callback_t) arg; switch (DIP(di,di_mode) & IFMT) { case IFLNK: - if (filesize > newsb->fs_maxsymlinklen) { + if (filesize <= newsb->fs_maxsymlinklen) { + break; + } + /* FALLTHROUGH */ case IFDIR: case IFREG: - map_inode_data_blocks(di, fn); - } + map_inode_data_blocks(di, fn); break; } } @@ -1956,7 +1958,7 @@ rescan_inomaps(int cgn) break; case IFDIR: cg->cg_cs.cs_ndir++; - /* fall through */ + /* FALLTHROUGH */ default: set_bits(cg_inosused(cg, 0), iwc, 1); break; @@ -2126,8 +2128,8 @@ main(int argc, char **argv) readat(where / DEV_BSIZE, oldsb, SBLOCKSIZE); switch (oldsb->fs_magic) { case FS_UFS2_MAGIC: - /* FALLTHROUGH */ is_ufs2 = 1; + /* FALLTHROUGH */ case FS_UFS1_MAGIC: needswap = 0; break;