Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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...)
This commit is contained in:
dholland 2015-08-02 18:11:57 +00:00
parent ae8b3536ce
commit 9263edc766
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sbin/mount_lfs/mount_lfs.c
View File

@ -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 @@ __COPYRIGHT("@(#) Copyright (c) 1993, 1994\
#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 @@ main(int argc, char **argv)
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 @@ mount_lfs_parseargs(int argc, char *argv[],
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];

6
sbin/mount_lfs/mount_lfs.h
View File

@ -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 **);

4
usr.sbin/puffs/rump_lfs/rump_lfs.c
View File

@ -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 @@ cleaner(void *arg)
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;