From c2a239ebc763c848d26be09fa819f922f6ee0c00 Mon Sep 17 00:00:00 2001 From: Julian Elischer Date: Fri, 5 Jun 1998 23:33:26 +0000 Subject: [PATCH] Reviewed by: Kirk Mckusick (mckusick@mckusick.com) Submitted by: luoqi Chen fix a type in fsck. (also add a comment that got picked up by mistake but is worth adding) --- sbin/fsck/pass5.c | 2 +- sbin/fsck_ffs/pass5.c | 2 +- sbin/fsck_ifs/pass5.c | 2 +- sys/netinet/ip_fw.c | 7 ++++++- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/sbin/fsck/pass5.c b/sbin/fsck/pass5.c index 873f008b8c7..aa37694fa1b 100644 --- a/sbin/fsck/pass5.c +++ b/sbin/fsck/pass5.c @@ -332,7 +332,7 @@ pass5() for (k = 0; k < NBBY; k++) { if ((j & (1 << k)) == 0) continue; - if (cg_inosused(cg)[i] & (1 << k)) + if (cg_blksfree(newcg)[i] & (1 << k)) continue; pwarn("ALLOCATED FRAG %d MARKED FREE", c * fs->fs_fpg + i * 8 + k); diff --git a/sbin/fsck_ffs/pass5.c b/sbin/fsck_ffs/pass5.c index 873f008b8c7..aa37694fa1b 100644 --- a/sbin/fsck_ffs/pass5.c +++ b/sbin/fsck_ffs/pass5.c @@ -332,7 +332,7 @@ pass5() for (k = 0; k < NBBY; k++) { if ((j & (1 << k)) == 0) continue; - if (cg_inosused(cg)[i] & (1 << k)) + if (cg_blksfree(newcg)[i] & (1 << k)) continue; pwarn("ALLOCATED FRAG %d MARKED FREE", c * fs->fs_fpg + i * 8 + k); diff --git a/sbin/fsck_ifs/pass5.c b/sbin/fsck_ifs/pass5.c index 873f008b8c7..aa37694fa1b 100644 --- a/sbin/fsck_ifs/pass5.c +++ b/sbin/fsck_ifs/pass5.c @@ -332,7 +332,7 @@ pass5() for (k = 0; k < NBBY; k++) { if ((j & (1 << k)) == 0) continue; - if (cg_inosused(cg)[i] & (1 << k)) + if (cg_blksfree(newcg)[i] & (1 << k)) continue; pwarn("ALLOCATED FRAG %d MARKED FREE", c * fs->fs_fpg + i * 8 + k); diff --git a/sys/netinet/ip_fw.c b/sys/netinet/ip_fw.c index df5e2f86075..53f28563b42 100644 --- a/sys/netinet/ip_fw.c +++ b/sys/netinet/ip_fw.c @@ -12,7 +12,7 @@ * * This software is provided ``AS IS'' without any warranties of any kind. * - * $Id: ip_fw.c,v 1.84 1998/05/25 10:37:44 julian Exp $ + * $Id: ip_fw.c,v 1.85 1998/06/05 22:39:53 julian Exp $ */ /* @@ -994,6 +994,11 @@ static int ip_fw_ctl(int stage, struct mbuf **mm) { int error; + /* + * If we have any number of rules, then it's worth while + * using clusters for this. The smaller case is rare. + * Note that using clusters for setsockopt is only in 3.0 at this time. + */ struct mbuf *m; if (stage == IP_FW_GET) {