Remove stray references to ext2fs, chfs, ffs, and mfs.
This commit is contained in:
dholland
parent
bf9cc163da
commit
eac0bd5b42
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: lfs.h,v 1.138 2013/06/06 00:48:04 dholland Exp $ */
|
||||
/* $NetBSD: lfs.h,v 1.139 2013/06/06 00:51:25 dholland Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
|
||||
|
|
@ -67,6 +67,9 @@
|
|||
#include <sys/queue.h>
|
||||
#include <sys/condvar.h>
|
||||
|
||||
/* XXX this should not be exposed */
|
||||
#include <ufs/lfs/ulfs_inode.h>
|
||||
|
||||
/*
|
||||
* Compile-time options for LFS.
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: ulfs_bmap.c,v 1.3 2013/06/06 00:48:04 dholland Exp $ */
|
||||
/* $NetBSD: ulfs_bmap.c,v 1.4 2013/06/06 00:51:25 dholland Exp $ */
|
||||
/* from NetBSD: ufs_bmap.c,v 1.50 2013/01/22 09:39:18 dholland Exp */
|
||||
|
||||
/*
|
||||
|
|
@ -38,10 +38,11 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: ulfs_bmap.c,v 1.3 2013/06/06 00:48:04 dholland Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: ulfs_bmap.c,v 1.4 2013/06/06 00:51:25 dholland Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/buf.h>
|
||||
#include <sys/proc.h>
|
||||
#include <sys/vnode.h>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: ulfs_inode.h,v 1.3 2013/06/06 00:48:04 dholland Exp $ */
|
||||
/* $NetBSD: ulfs_inode.h,v 1.4 2013/06/06 00:51:25 dholland Exp $ */
|
||||
/* from NetBSD: inode.h,v 1.64 2012/11/19 00:36:21 jakllsch Exp */
|
||||
|
||||
/*
|
||||
|
|
@ -44,7 +44,6 @@
|
|||
#include <ufs/lfs/ulfs_dinode.h>
|
||||
#include <ufs/lfs/ulfs_dir.h>
|
||||
#include <ufs/lfs/ulfs_quotacommon.h>
|
||||
#include <ufs/ext2fs/ext2fs_dinode.h>
|
||||
#include <miscfs/genfs/genfs_node.h>
|
||||
|
||||
/*
|
||||
|
|
@ -69,18 +68,6 @@ struct ulfs_lookup_results {
|
|||
/*
|
||||
* Per-filesystem inode extensions.
|
||||
*/
|
||||
struct ffs_inode_ext {
|
||||
daddr_t *ffs_snapblklist; /* Collect expunged snapshot blocks. */
|
||||
/* follow two fields are used by contiguous allocation code only. */
|
||||
daddr_t ffs_first_data_blk; /* first data block on disk. */
|
||||
daddr_t ffs_first_indir_blk; /* first indirect block on disk. */
|
||||
};
|
||||
|
||||
struct ext2fs_inode_ext {
|
||||
daddr_t ext2fs_last_lblk; /* last logical block allocated */
|
||||
daddr_t ext2fs_last_blk; /* last block allocated on disk */
|
||||
};
|
||||
|
||||
struct lfs_inode_ext;
|
||||
|
||||
/*
|
||||
|
|
@ -104,13 +91,9 @@ struct inode {
|
|||
ino_t i_number; /* The identity of the inode. */
|
||||
|
||||
union { /* Associated filesystem. */
|
||||
struct fs *fs; /* FFS */
|
||||
struct lfs *lfs; /* LFS */
|
||||
struct m_ext2fs *e2fs; /* EXT2FS */
|
||||
} inode_u;
|
||||
#define i_fs inode_u.fs
|
||||
#define i_lfs inode_u.lfs
|
||||
#define i_e2fs inode_u.e2fs
|
||||
|
||||
void *i_unused1; /* Unused. */
|
||||
struct dquot *i_dquot[ULFS_MAXQUOTAS]; /* Dquot structures. */
|
||||
|
|
@ -129,20 +112,12 @@ struct inode {
|
|||
*/
|
||||
union {
|
||||
/* Other extensions could go here... */
|
||||
struct ffs_inode_ext ffs;
|
||||
struct ext2fs_inode_ext e2fs;
|
||||
struct lfs_inode_ext *lfs;
|
||||
} inode_ext;
|
||||
#define i_snapblklist inode_ext.ffs.ffs_snapblklist
|
||||
#define i_ffs_first_data_blk inode_ext.ffs.ffs_first_data_blk
|
||||
#define i_ffs_first_indir_blk inode_ext.ffs.ffs_first_indir_blk
|
||||
#define i_e2fs_last_lblk inode_ext.e2fs.ext2fs_last_lblk
|
||||
#define i_e2fs_last_blk inode_ext.e2fs.ext2fs_last_blk
|
||||
/*
|
||||
* Copies from the on-disk dinode itself.
|
||||
*
|
||||
* These fields are currently only used by FFS and LFS,
|
||||
* do NOT use them with ext2fs.
|
||||
* These fields are currently only used by LFS.
|
||||
*/
|
||||
u_int16_t i_mode; /* IFMT, permissions; see below. */
|
||||
int16_t i_nlink; /* File link count. */
|
||||
|
|
@ -161,8 +136,6 @@ struct inode {
|
|||
union {
|
||||
struct ulfs1_dinode *ffs1_din; /* 128 bytes of the on-disk dinode. */
|
||||
struct ulfs2_dinode *ffs2_din;
|
||||
struct ext2fs_dinode *e2fs_din; /* 128 bytes of the on-disk
|
||||
dinode. */
|
||||
} i_din;
|
||||
};
|
||||
|
||||
|
|
@ -210,29 +183,6 @@ struct inode {
|
|||
#define i_ffs2_extsize i_din.ffs2_din->di_extsize
|
||||
#define i_ffs2_extb i_din.ffs2_din->di_extb
|
||||
|
||||
#define i_e2fs_mode i_din.e2fs_din->e2di_mode
|
||||
#define i_e2fs_uid i_din.e2fs_din->e2di_uid
|
||||
#define i_e2fs_size i_din.e2fs_din->e2di_size
|
||||
#define i_e2fs_atime i_din.e2fs_din->e2di_atime
|
||||
#define i_e2fs_ctime i_din.e2fs_din->e2di_ctime
|
||||
#define i_e2fs_mtime i_din.e2fs_din->e2di_mtime
|
||||
#define i_e2fs_dtime i_din.e2fs_din->e2di_dtime
|
||||
#define i_e2fs_gid i_din.e2fs_din->e2di_gid
|
||||
#define i_e2fs_nlink i_din.e2fs_din->e2di_nlink
|
||||
#define i_e2fs_nblock i_din.e2fs_din->e2di_nblock
|
||||
#define i_e2fs_flags i_din.e2fs_din->e2di_flags
|
||||
#define i_e2fs_version i_din.e2fs_din->e2di_version
|
||||
#define i_e2fs_blocks i_din.e2fs_din->e2di_blocks
|
||||
#define i_e2fs_rdev i_din.e2fs_din->e2di_rdev
|
||||
#define i_e2fs_gen i_din.e2fs_din->e2di_gen
|
||||
#define i_e2fs_facl i_din.e2fs_din->e2di_facl
|
||||
#define i_e2fs_dacl i_din.e2fs_din->e2di_dacl
|
||||
#define i_e2fs_faddr i_din.e2fs_din->e2di_faddr
|
||||
#define i_e2fs_nblock_high i_din.e2fs_din->e2di_nblock_high
|
||||
#define i_e2fs_facl_high i_din.e2fs_din->e2di_facl_high
|
||||
#define i_e2fs_uid_high i_din.e2fs_din->e2di_uid_high
|
||||
#define i_e2fs_gid_high i_din.e2fs_din->e2di_gid_high
|
||||
|
||||
/* These flags are kept in i_flag. */
|
||||
#define IN_ACCESS 0x0001 /* Access time update request. */
|
||||
#define IN_CHANGE 0x0002 /* Inode change time update request. */
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: ulfs_quota2_subr.c,v 1.4 2013/06/06 00:49:28 dholland Exp $ */
|
||||
/* $NetBSD: ulfs_quota2_subr.c,v 1.5 2013/06/06 00:51:25 dholland Exp $ */
|
||||
/* from NetBSD: quota2_subr.c,v 1.5 2012/02/05 14:19:04 dholland Exp */
|
||||
|
||||
/*-
|
||||
|
|
@ -28,14 +28,14 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: ulfs_quota2_subr.c,v 1.4 2013/06/06 00:49:28 dholland Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: ulfs_quota2_subr.c,v 1.5 2013/06/06 00:51:25 dholland Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/time.h>
|
||||
|
||||
#include <ufs/lfs/ulfs_dinode.h>
|
||||
#include <ufs/ffs/fs.h>
|
||||
#include <ufs/ffs/ffs_extern.h>
|
||||
#include <ufs/lfs/lfs.h>
|
||||
#include <ufs/lfs/lfs_extern.h>
|
||||
#include <ufs/lfs/ulfs_bswap.h>
|
||||
#include <ufs/lfs/ulfs_quota2.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: ulfs_vnops.c,v 1.5 2013/06/06 00:49:28 dholland Exp $ */
|
||||
/* $NetBSD: ulfs_vnops.c,v 1.6 2013/06/06 00:51:25 dholland Exp $ */
|
||||
/* from NetBSD: ufs_vnops.c,v 1.212 2013/03/18 19:35:48 plunky Exp */
|
||||
|
||||
/*-
|
||||
|
|
@ -67,7 +67,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: ulfs_vnops.c,v 1.5 2013/06/06 00:49:28 dholland Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: ulfs_vnops.c,v 1.6 2013/06/06 00:51:25 dholland Exp $");
|
||||
|
||||
#if defined(_KERNEL_OPT)
|
||||
#include "opt_lfs.h"
|
||||
|
|
@ -106,17 +106,11 @@ __KERNEL_RCSID(0, "$NetBSD: ulfs_vnops.c,v 1.5 2013/06/06 00:49:28 dholland Exp
|
|||
#ifdef LFS_DIRHASH
|
||||
#include <ufs/lfs/ulfs_dirhash.h>
|
||||
#endif
|
||||
#include <ufs/ext2fs/ext2fs_extern.h>
|
||||
#include <ufs/ext2fs/ext2fs_dir.h>
|
||||
#include <ufs/ffs/ffs_extern.h>
|
||||
#include <ufs/lfs/lfs_extern.h>
|
||||
#include <ufs/lfs/lfs.h>
|
||||
|
||||
#include <uvm/uvm.h>
|
||||
|
||||
__CTASSERT(EXT2FS_MAXNAMLEN == FFS_MAXNAMLEN);
|
||||
__CTASSERT(LFS_MAXNAMLEN == FFS_MAXNAMLEN);
|
||||
|
||||
static int ulfs_chmod(struct vnode *, int, kauth_cred_t, struct lwp *);
|
||||
static int ulfs_chown(struct vnode *, uid_t, gid_t, kauth_cred_t,
|
||||
struct lwp *);
|
||||
|
|
@ -1702,7 +1696,7 @@ ulfs_pathconf(void *v)
|
|||
*ap->a_retval = LINK_MAX;
|
||||
return (0);
|
||||
case _PC_NAME_MAX:
|
||||
*ap->a_retval = FFS_MAXNAMLEN;
|
||||
*ap->a_retval = LFS_MAXNAMLEN;
|
||||
return (0);
|
||||
case _PC_PATH_MAX:
|
||||
*ap->a_retval = PATH_MAX;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: ulfs_wapbl.c,v 1.3 2013/06/06 00:48:04 dholland Exp $ */
|
||||
/* $NetBSD: ulfs_wapbl.c,v 1.4 2013/06/06 00:51:25 dholland Exp $ */
|
||||
/* from NetBSD: ufs_wapbl.c,v 1.23 2012/01/27 19:22:50 para Exp */
|
||||
|
||||
/*-
|
||||
|
|
@ -67,7 +67,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: ulfs_wapbl.c,v 1.3 2013/06/06 00:48:04 dholland Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: ulfs_wapbl.c,v 1.4 2013/06/06 00:51:25 dholland Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
|
|
@ -96,7 +96,6 @@ __KERNEL_RCSID(0, "$NetBSD: ulfs_wapbl.c,v 1.3 2013/06/06 00:48:04 dholland Exp
|
|||
#include <ufs/lfs/ulfs_bswap.h>
|
||||
#include <ufs/lfs/ulfs_extern.h>
|
||||
#include <ufs/lfs/ulfs_wapbl.h>
|
||||
#include <ufs/ext2fs/ext2fs_extern.h>
|
||||
#include <ufs/lfs/lfs_extern.h>
|
||||
|
||||
#include <uvm/uvm.h>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: ulfsmount.h,v 1.4 2013/06/06 00:48:04 dholland Exp $ */
|
||||
/* $NetBSD: ulfsmount.h,v 1.5 2013/06/06 00:51:25 dholland Exp $ */
|
||||
/* from NetBSD: ufsmount.h,v 1.39 2012/10/19 17:09:08 drochner Exp */
|
||||
|
||||
/*
|
||||
|
|
@ -44,16 +44,6 @@ struct ulfs_args {
|
|||
char *fspec; /* block special device to mount */
|
||||
};
|
||||
|
||||
/*
|
||||
* Arguments to mount MFS
|
||||
*/
|
||||
struct mfs_args {
|
||||
char *fspec; /* name to export for statfs */
|
||||
struct export_args30 _pad1; /* compat with old userland tools */
|
||||
void * base; /* base of file system in memory */
|
||||
u_long size; /* size of file system */
|
||||
};
|
||||
|
||||
#ifdef _KERNEL
|
||||
|
||||
#if defined(_KERNEL_OPT)
|
||||
|
|
@ -80,16 +70,9 @@ struct ulfsmount {
|
|||
u_long um_fstype;
|
||||
u_int32_t um_flags; /* ULFS-specific flags - see below */
|
||||
union { /* pointer to superblock */
|
||||
struct fs *fs; /* FFS */
|
||||
struct lfs *lfs; /* LFS */
|
||||
struct m_ext2fs *e2fs; /* EXT2FS */
|
||||
struct chfs_mount *chfs; /* CHFS */
|
||||
} ulfsmount_u;
|
||||
#define um_fs ulfsmount_u.fs
|
||||
#define um_lfs ulfsmount_u.lfs
|
||||
#define um_e2fs ulfsmount_u.e2fs
|
||||
#define um_e2fsb ulfsmount_u.e2fs->s_es
|
||||
#define um_chfs ulfsmount_u.chfs
|
||||
|
||||
/* Extended attribute information. */
|
||||
struct ulfs_extattr_per_mount um_extattr;
|
||||
|
|
|
|||
Loading…
Reference in New Issue