diff options
| author |   millert <millert@openbsd.org> | 2007-05-18 19:21:34 +0000 |
|---|---|---|
| committer | millert <millert@openbsd.org> | 2007-05-18 19:21:34 +0000 |
| commit | 32f70f4d664a4c3772a4f41ad138539d37027e40 (patch) | |
| tree | 2ef0ddff8a9aa806c206200d36896caf21059b2a | |
| parent | add the panels made by Hantouch (http://www.hantouch.com/) to the list (diff) | |
| download | wireguard-openbsd-32f70f4d664a4c3772a4f41ad138539d37027e40.tar.xz wireguard-openbsd-32f70f4d664a4c3772a4f41ad138539d37027e40.zip | |
Fix mismerge; remove statement without effect. OK otto@ pedro@
| -rw-r--r-- | sbin/fsck_ffs/pass5.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sbin/fsck_ffs/pass5.c b/sbin/fsck_ffs/pass5.c index a14f53aa3ef..498434194e9 100644 --- a/sbin/fsck_ffs/pass5.c +++ b/sbin/fsck_ffs/pass5.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pass5.c,v 1.31 2007/05/11 08:28:52 otto Exp $ */ +/* $OpenBSD: pass5.c,v 1.32 2007/05/18 19:21:34 millert Exp $ */ /* $NetBSD: pass5.c,v 1.16 1996/09/27 22:45:18 christos Exp $ */ /* @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)pass5.c 8.6 (Berkeley) 11/30/94"; #else -static const char rcsid[] = "$OpenBSD: pass5.c,v 1.31 2007/05/11 08:28:52 otto Exp $"; +static const char rcsid[] = "$OpenBSD: pass5.c,v 1.32 2007/05/18 19:21:34 millert Exp $"; #endif #endif /* not lint */ @@ -280,7 +280,6 @@ pass5(void) } if (frags == fs->fs_frag) { newcg->cg_cs.cs_nbfree++; - j = cbtocylno(fs, i); if (fs->fs_contigsumsize > 0) setbit(cg_clustersfree(newcg), i / fs->fs_frag); |