From a6be8fe77d4938b29cf75fd12ddfee98e132d71f Mon Sep 17 00:00:00 2001
From: "Todd C. Miller" <millert@cvs.openbsd.org>
Date: Fri, 18 May 2007 19:21:35 +0000
Subject: Fix mismerge; remove statement without effect.  OK otto@ pedro@

---
 sbin/fsck_ffs/pass5.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'sbin/fsck_ffs/pass5.c')

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);
-- 
cgit v1.2.3