Remove LFS-related code, no binary change

2 files changed, 2 insertions, 102 deletions

diff --git a/bin/df/df.c b/bin/df/df.c
index 9efb5d2d08c..b329344fcc1 100644
--- a/bin/df/df.c
+++ b/bin/df/df.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: df.c,v 1.44 2006/05/11 15:06:51 deraadt Exp $	*/
+/*	$OpenBSD: df.c,v 1.45 2006/09/21 20:06:33 pedro Exp $	*/
 /*	$NetBSD: df.c,v 1.21.2.1 1995/11/01 00:06:11 jtc Exp $	*/
 
 /*
@@ -45,7 +45,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)df.c	8.7 (Berkeley) 4/2/94";
 #else
-static char rcsid[] = "$OpenBSD: df.c,v 1.44 2006/05/11 15:06:51 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: df.c,v 1.45 2006/09/21 20:06:33 pedro Exp $";
 #endif
 #endif /* not lint */
 
@@ -79,7 +79,6 @@ void	 prthuman(struct statfs *sfsp, unsigned long);
 
 int		raw_df(char *, struct statfs *);
 extern int	ffs_df(int, char *, struct statfs *);
-extern int	lfs_df(int, char *, struct statfs *);
 extern int	e2fs_df(int, char *, struct statfs *);
 
 int	hflag, iflag, kflag, lflag, nflag, Pflag;
@@ -447,10 +446,6 @@ raw_df(char *file, struct statfs *sfsp)
 
 	if (ffs_df(rfd, file, sfsp) == 0) {
 		ret = 0;
-#if 0
-	} else if (lfs_df(rfd, file, sfsp) == 0) {
-		ret = 0;
-#endif
 	} else if (e2fs_df(rfd, file, sfsp) == 0) {
 		ret = 0;
 	}
diff --git a/bin/df/lfs_df.c b/bin/df/lfs_df.c
deleted file mode 100644
index 8a050a52aee..00000000000
--- a/bin/df/lfs_df.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/*	$OpenBSD: lfs_df.c,v 1.9 2003/06/02 23:32:07 millert Exp $	*/
-
-/*
- * This file is substantially duplicated from src/sys/ufs/lfs/lfs_vfsops.c:lfs_statfs().
- * That file's copyright is applied here.
- */
-/*
- * Copyright (c) 1989, 1991, 1993, 1994
- *      The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)lfs_vfsops.c	8.20 (Berkeley) 6/10/95
- */
-
-#include <sys/param.h>
-#include <sys/mount.h>
-
-#include <ufs/ufs/quota.h>
-#include <ufs/ufs/dinode.h>
-#include <ufs/lfs/lfs.h>
-
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <fcntl.h>
-#include <fstab.h>
-
-int		lfs_df(int, char *, struct statfs *);
-
-extern int	bread(int, off_t, void *, int);
-extern char	*getmntpt(char *);
-
-union {
-	struct lfs il_fs;
-	char dummy[LFS_SBPAD];
-} sb;
-#define sblock sb.il_fs
-
-int
-lfs_df(int rfd, char *file, struct statfs *sfsp)
-{
-	char *mntpt;
-
-	if (bread(rfd, (off_t)LFS_LABELPAD, &sblock, LFS_SBPAD) == 0) {
-		return (-1);
-	}
-	if (sblock.lfs_magic != LFS_MAGIC) {
-		return (-1);
-	}
-	sfsp->f_flags = 0;	/* The fs is not mapped, so no flags */
-	sfsp->f_bsize = sblock.lfs_bsize;
-	sfsp->f_iosize = sblock.lfs_bsize;
-	sfsp->f_blocks = dbtofrags(&sblock, sblock.lfs_dsize);
-	sfsp->f_bfree = dbtofrags(&sblock, sblock.lfs_bfree);
-	sfsp->f_bavail = sblock.lfs_dsize * (100 - sblock.lfs_minfree) / 100;
-	sfsp->f_bavail = (sfsp->f_bavail > sblock.lfs_bfree) ?
-					sblock.lfs_bfree : sfsp->f_bavail;
-	sfsp->f_bavail = dbtofrags(&sblock, sfsp->f_bavail);
-	if (sfsp->f_bavail < 0)
-		sfsp->f_bavail = 0;
-
-	sfsp->f_files = sblock.lfs_nfiles;
-	sfsp->f_ffree = sblock.lfs_bfree * sblock.lfs_inopb;
-	sfsp->f_fsid.val[0] = 0;
-	sfsp->f_fsid.val[1] = 0;
-	if ((mntpt = getmntpt(file)) == 0)
-		mntpt = "";
-	memmove(&sfsp->f_mntonname[0], mntpt, MNAMELEN);
-	memmove(&sfsp->f_mntfromname[0], file, MNAMELEN);
-	strlcpy(sfsp->f_fstypename, MOUNT_LFS, MFSNAMELEN);
-	return (0);
-}