[src/trunk]: src Use the lfs header file and lfs's mount args struct, not ufs...

[dholland <dholland%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d815c303d3da
branches:  trunk
changeset: 809805:d815c303d3da
user:      dholland <dholland%NetBSD.org@localhost>
date:      Sun Aug 02 18:11:57 2015 +0000

description:
Use the lfs header file and lfs's mount args struct, not ufsmount.h
and the ffs mount args struct, for mounting lfs.

(they are the same, so this doesn't matter yet, but still...)

diffstat:

 sbin/mount_lfs/mount_lfs.c         |  10 +++++-----
 sbin/mount_lfs/mount_lfs.h         |   6 +++---
 usr.sbin/puffs/rump_lfs/rump_lfs.c |   4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diffs (84 lines):

diff -r e4df21c6c06b -r d815c303d3da sbin/mount_lfs/mount_lfs.c
--- a/sbin/mount_lfs/mount_lfs.c        Sun Aug 02 18:11:36 2015 +0000
+++ b/sbin/mount_lfs/mount_lfs.c        Sun Aug 02 18:11:57 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mount_lfs.c,v 1.37 2013/10/19 23:14:27 christos Exp $  */
+/*     $NetBSD: mount_lfs.c,v 1.38 2015/08/02 18:11:57 dholland Exp $  */
 
 /*-
  * Copyright (c) 1993, 1994
@@ -39,14 +39,14 @@
 #if 0
 static char sccsid[] = "@(#)mount_lfs.c        8.4 (Berkeley) 4/26/95";
 #else
-__RCSID("$NetBSD: mount_lfs.c,v 1.37 2013/10/19 23:14:27 christos Exp $");
+__RCSID("$NetBSD: mount_lfs.c,v 1.38 2015/08/02 18:11:57 dholland Exp $");
 #endif
 #endif /* not lint */
 
 #include <sys/param.h>
 #include <sys/mount.h>
 
-#include <ufs/ufs/ufsmount.h>
+#include <ufs/lfs/lfs.h>
 
 #include <err.h>
 #include <errno.h>
@@ -94,7 +94,7 @@
 
 void
 mount_lfs_parseargs(int argc, char *argv[],
-       struct ufs_args *args, int *mntflags,
+       struct ulfs_args *args, int *mntflags,
        char *canon_dev, char *canon_dir)
 {
        int ch;
@@ -149,7 +149,7 @@
 int
 mount_lfs(int argc, char *argv[])
 {
-       struct ufs_args args;
+       struct ulfs_args args;
        int mntflags;
        int mntsize, oldflags, i;
        char fs_name[MAXPATHLEN], canon_dev[MAXPATHLEN];
diff -r e4df21c6c06b -r d815c303d3da sbin/mount_lfs/mount_lfs.h
--- a/sbin/mount_lfs/mount_lfs.h        Sun Aug 02 18:11:36 2015 +0000
+++ b/sbin/mount_lfs/mount_lfs.h        Sun Aug 02 18:11:57 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mount_lfs.h,v 1.2 2009/08/06 00:58:32 pooka Exp $      */
+/*     $NetBSD: mount_lfs.h,v 1.3 2015/08/02 18:11:57 dholland Exp $   */
 
 /*
  * Copyright (c) 2008 The NetBSD Foundation.  All Rights Reserved.
@@ -28,10 +28,10 @@
 #ifndef _SBIN_MOUNT_LFS_MOUNT_LFS_H_
 #define _SBIN_MOUNT_LFS_MOUNT_LFS_H_
 
-#include <ufs/ufs/ufsmount.h>
+#include <ufs/lfs/lfs.h>
 
 int    mount_lfs(int, char **);
-void   mount_lfs_parseargs(int, char **, struct ufs_args *, int *,
+void   mount_lfs_parseargs(int, char **, struct ulfs_args *, int *,
                            char *, char *);
 
 int    lfs_cleaner_main(int, char **);
diff -r e4df21c6c06b -r d815c303d3da usr.sbin/puffs/rump_lfs/rump_lfs.c
--- a/usr.sbin/puffs/rump_lfs/rump_lfs.c        Sun Aug 02 18:11:36 2015 +0000
+++ b/usr.sbin/puffs/rump_lfs/rump_lfs.c        Sun Aug 02 18:11:57 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rump_lfs.c,v 1.17 2013/01/10 08:35:26 riastradh Exp $  */
+/*     $NetBSD: rump_lfs.c,v 1.18 2015/08/02 18:11:57 dholland Exp $   */
 
 /*
  * Copyright (c) 2008 Antti Kantee.  All Rights Reserved.
@@ -60,7 +60,7 @@
 int
 main(int argc, char *argv[])
 {
-       struct ufs_args args;
+       struct ulfs_args args;
        char canon_dev[UKFS_DEVICE_MAXPATHLEN], canon_dir[MAXPATHLEN];
        char rawdev[MAXPATHLEN];
        struct p2k_mount *p2m;