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

move cd9660 filesystem code from sys/isofs/cd9660 to sys/fs/cd9660

This commit is contained in:
jdolecek 2002-12-23 17:52:02 +00:00
parent 5d0e84b25e
commit 3a8872dee7
23 changed files with 73 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/Makefile
View File

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.49 2002/12/23 17:38:21 jdolecek Exp $
# $NetBSD: Makefile,v 1.50 2002/12/23 17:52:02 jdolecek Exp $
SUBDIR= altq arch compat dev fs isofs lkm miscfs msdosfs \
SUBDIR= altq arch compat dev fs lkm miscfs msdosfs \
net netatalk netccitt netinet netinet6 netisdn netiso netkey \
netnatm netns netsmb nfs sys ufs uvm

4
sys/conf/files
View File

@ -1,4 +1,4 @@
# $NetBSD: files,v 1.585 2002/12/23 17:38:19 jdolecek Exp $
# $NetBSD: files,v 1.586 2002/12/23 17:52:03 jdolecek Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
@ -967,7 +967,7 @@ include "fs/adosfs/files.adosfs"
include "coda/files.coda"
include "fs/filecorefs/files.filecorefs"
include "fs/smbfs/files.smbfs"
include "isofs/cd9660/files.cd9660"
include "fs/cd9660/files.cd9660"
include "miscfs/fdesc/files.fdesc"
include "miscfs/kernfs/files.kernfs"
include "miscfs/nullfs/files.nullfs"

4
sys/fs/Makefile
View File

@ -1,5 +1,5 @@
# $NetBSD: Makefile,v 1.4 2002/12/23 17:38:21 jdolecek Exp $
# $NetBSD: Makefile,v 1.5 2002/12/23 17:52:03 jdolecek Exp $
SUBDIR= adosfs filecorefs ntfs smbfs
SUBDIR= adosfs cd9660 filecorefs ntfs smbfs
.include <bsd.kinc.mk>

2
sys/isofs/cd9660/Makefile → sys/fs/cd9660/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.1 1998/06/12 23:23:00 cgd Exp $
# $NetBSD: Makefile,v 1.1 2002/12/23 17:52:08 jdolecek Exp $
INCSDIR= /usr/include/isofs/cd9660

2
sys/isofs/cd9660/TODO → sys/fs/cd9660/TODO
View File

@ -1,4 +1,4 @@
# $NetBSD: TODO,v 1.4 1994/07/19 11:34:48 mycroft Exp $
# $NetBSD: TODO,v 1.1 2002/12/23 17:52:08 jdolecek Exp $
1) should understand "older", original High Sierra ("CDROM001") type

2
sys/isofs/cd9660/TODO.hibler → sys/fs/cd9660/TODO.hibler
View File

@ -1,4 +1,4 @@
# $NetBSD: TODO.hibler,v 1.8 2001/07/22 13:34:10 wiz Exp $
# $NetBSD: TODO.hibler,v 1.1 2002/12/23 17:52:08 jdolecek Exp $
1. Investiate making ISOFS another UFS shared filesystem (ala FFS/MFS/LFS).
Since it was modelled after the inode code, we might be able to merge

10
sys/isofs/cd9660/cd9660_bmap.c → sys/fs/cd9660/cd9660_bmap.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cd9660_bmap.c,v 1.8 2001/11/12 15:29:48 lukem Exp $ */
/* $NetBSD: cd9660_bmap.c,v 1.1 2002/12/23 17:52:08 jdolecek Exp $ */
/*-
* Copyright (c) 1994
@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: cd9660_bmap.c,v 1.8 2001/11/12 15:29:48 lukem Exp $");
__KERNEL_RCSID(0, "$NetBSD: cd9660_bmap.c,v 1.1 2002/12/23 17:52:08 jdolecek Exp $");
#include <sys/param.h>
#include <sys/namei.h>
@ -50,9 +50,9 @@ __KERNEL_RCSID(0, "$NetBSD: cd9660_bmap.c,v 1.8 2001/11/12 15:29:48 lukem Exp $"
#include <sys/vnode.h>
#include <sys/mount.h>
#include <isofs/cd9660/iso.h>
#include <isofs/cd9660/cd9660_extern.h>
#include <isofs/cd9660/cd9660_node.h>
#include <fs/cd9660/iso.h>
#include <fs/cd9660/cd9660_extern.h>
#include <fs/cd9660/cd9660_node.h>
/*
* Bmap converts a the logical block number of a file to its physical block

2
sys/isofs/cd9660/cd9660_extern.h → sys/fs/cd9660/cd9660_extern.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: cd9660_extern.h,v 1.10 2001/09/15 16:12:56 chs Exp $ */
/* $NetBSD: cd9660_extern.h,v 1.1 2002/12/23 17:52:08 jdolecek Exp $ */
/*-
* Copyright (c) 1994

16
sys/isofs/cd9660/cd9660_lookup.c → sys/fs/cd9660/cd9660_lookup.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cd9660_lookup.c,v 1.28 2001/11/12 15:29:48 lukem Exp $ */
/* $NetBSD: cd9660_lookup.c,v 1.1 2002/12/23 17:52:08 jdolecek Exp $ */
/*-
* Copyright (c) 1989, 1993, 1994
@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: cd9660_lookup.c,v 1.28 2001/11/12 15:29:48 lukem Exp $");
__KERNEL_RCSID(0, "$NetBSD: cd9660_lookup.c,v 1.1 2002/12/23 17:52:08 jdolecek Exp $");
#include <sys/param.h>
#include <sys/namei.h>
@ -53,12 +53,12 @@ __KERNEL_RCSID(0, "$NetBSD: cd9660_lookup.c,v 1.28 2001/11/12 15:29:48 lukem Exp
#include <sys/mount.h>
#include <sys/systm.h>
#include <isofs/cd9660/iso.h>
#include <isofs/cd9660/cd9660_extern.h>
#include <isofs/cd9660/cd9660_node.h>
#include <isofs/cd9660/iso_rrip.h>
#include <isofs/cd9660/cd9660_rrip.h>
#include <isofs/cd9660/cd9660_mount.h>
#include <fs/cd9660/iso.h>
#include <fs/cd9660/cd9660_extern.h>
#include <fs/cd9660/cd9660_node.h>
#include <fs/cd9660/iso_rrip.h>
#include <fs/cd9660/cd9660_rrip.h>
#include <fs/cd9660/cd9660_mount.h>
struct nchstats iso_nchstats;

2
sys/isofs/cd9660/cd9660_mount.h → sys/fs/cd9660/cd9660_mount.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: cd9660_mount.h,v 1.6 2002/09/21 18:12:43 christos Exp $ */
/* $NetBSD: cd9660_mount.h,v 1.1 2002/12/23 17:52:08 jdolecek Exp $ */
/*
* Copyright (c) 1995
* The Regents of the University of California. All rights reserved.

14
sys/isofs/cd9660/cd9660_node.c → sys/fs/cd9660/cd9660_node.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cd9660_node.c,v 1.29 2002/11/07 08:13:10 thorpej Exp $ */
/* $NetBSD: cd9660_node.c,v 1.1 2002/12/23 17:52:09 jdolecek Exp $ */
/*-
* Copyright (c) 1982, 1986, 1989, 1994
@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: cd9660_node.c,v 1.29 2002/11/07 08:13:10 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: cd9660_node.c,v 1.1 2002/12/23 17:52:09 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -56,11 +56,11 @@ __KERNEL_RCSID(0, "$NetBSD: cd9660_node.c,v 1.29 2002/11/07 08:13:10 thorpej Exp
#include <sys/pool.h>
#include <sys/stat.h>
#include <isofs/cd9660/iso.h>
#include <isofs/cd9660/cd9660_extern.h>
#include <isofs/cd9660/cd9660_node.h>
#include <isofs/cd9660/cd9660_mount.h>
#include <isofs/cd9660/iso_rrip.h>
#include <fs/cd9660/iso.h>
#include <fs/cd9660/cd9660_extern.h>
#include <fs/cd9660/cd9660_node.h>
#include <fs/cd9660/cd9660_mount.h>
#include <fs/cd9660/iso_rrip.h>
/*
* Structures associated with iso_node caching.

2
sys/isofs/cd9660/cd9660_node.h → sys/fs/cd9660/cd9660_node.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: cd9660_node.h,v 1.22 2001/09/15 20:36:36 chs Exp $ */
/* $NetBSD: cd9660_node.h,v 1.1 2002/12/23 17:52:09 jdolecek Exp $ */
/*-
* Copyright (c) 1994

14
sys/isofs/cd9660/cd9660_rrip.c → sys/fs/cd9660/cd9660_rrip.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cd9660_rrip.c,v 1.24 2001/11/15 09:48:20 lukem Exp $ */
/* $NetBSD: cd9660_rrip.c,v 1.1 2002/12/23 17:52:09 jdolecek Exp $ */
/*-
* Copyright (c) 1993, 1994
@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: cd9660_rrip.c,v 1.24 2001/11/15 09:48:20 lukem Exp $");
__KERNEL_RCSID(0, "$NetBSD: cd9660_rrip.c,v 1.1 2002/12/23 17:52:09 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -55,11 +55,11 @@ __KERNEL_RCSID(0, "$NetBSD: cd9660_rrip.c,v 1.24 2001/11/15 09:48:20 lukem Exp $
#include <sys/time.h>
#include <isofs/cd9660/iso.h>
#include <isofs/cd9660/cd9660_extern.h>
#include <isofs/cd9660/cd9660_node.h>
#include <isofs/cd9660/cd9660_rrip.h>
#include <isofs/cd9660/iso_rrip.h>
#include <fs/cd9660/iso.h>
#include <fs/cd9660/cd9660_extern.h>
#include <fs/cd9660/cd9660_node.h>
#include <fs/cd9660/cd9660_rrip.h>
#include <fs/cd9660/iso_rrip.h>
typedef struct {
char type[2];

2
sys/isofs/cd9660/cd9660_rrip.h → sys/fs/cd9660/cd9660_rrip.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: cd9660_rrip.h,v 1.6 1994/12/13 22:33:24 mycroft Exp $ */
/* $NetBSD: cd9660_rrip.h,v 1.1 2002/12/23 17:52:09 jdolecek Exp $ */
/*-
* Copyright (c) 1993, 1994

8
sys/isofs/cd9660/cd9660_util.c → sys/fs/cd9660/cd9660_util.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cd9660_util.c,v 1.16 2001/11/12 15:29:49 lukem Exp $ */
/* $NetBSD: cd9660_util.c,v 1.1 2002/12/23 17:52:09 jdolecek Exp $ */
/*-
* Copyright (c) 1994
@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: cd9660_util.c,v 1.16 2001/11/12 15:29:49 lukem Exp $");
__KERNEL_RCSID(0, "$NetBSD: cd9660_util.c,v 1.1 2002/12/23 17:52:09 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -57,8 +57,8 @@ __KERNEL_RCSID(0, "$NetBSD: cd9660_util.c,v 1.16 2001/11/12 15:29:49 lukem Exp $
#include <sys/malloc.h>
#include <sys/dirent.h>
#include <isofs/cd9660/iso.h>
#include <isofs/cd9660/cd9660_extern.h>
#include <fs/cd9660/iso.h>
#include <fs/cd9660/cd9660_extern.h>
/*
* Get one character out of an iso filename

14
sys/isofs/cd9660/cd9660_vfsops.c → sys/fs/cd9660/cd9660_vfsops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cd9660_vfsops.c,v 1.64 2002/09/21 18:12:43 christos Exp $ */
/* $NetBSD: cd9660_vfsops.c,v 1.1 2002/12/23 17:52:09 jdolecek Exp $ */
/*-
* Copyright (c) 1994
@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: cd9660_vfsops.c,v 1.64 2002/09/21 18:12:43 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: cd9660_vfsops.c,v 1.1 2002/12/23 17:52:09 jdolecek Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@ -67,11 +67,11 @@ __KERNEL_RCSID(0, "$NetBSD: cd9660_vfsops.c,v 1.64 2002/09/21 18:12:43 christos
#include <sys/stat.h>
#include <sys/conf.h>
#include <isofs/cd9660/iso.h>
#include <isofs/cd9660/cd9660_extern.h>
#include <isofs/cd9660/iso_rrip.h>
#include <isofs/cd9660/cd9660_node.h>
#include <isofs/cd9660/cd9660_mount.h>
#include <fs/cd9660/iso.h>
#include <fs/cd9660/cd9660_extern.h>
#include <fs/cd9660/iso_rrip.h>
#include <fs/cd9660/cd9660_node.h>
#include <fs/cd9660/cd9660_mount.h>
extern const struct vnodeopv_desc cd9660_vnodeop_opv_desc;
extern const struct vnodeopv_desc cd9660_specop_opv_desc;

14
sys/isofs/cd9660/cd9660_vnops.c → sys/fs/cd9660/cd9660_vnops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cd9660_vnops.c,v 1.72 2002/10/23 09:14:11 jdolecek Exp $ */
/* $NetBSD: cd9660_vnops.c,v 1.1 2002/12/23 17:52:09 jdolecek Exp $ */
/*-
* Copyright (c) 1994
@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: cd9660_vnops.c,v 1.72 2002/10/23 09:14:11 jdolecek Exp $");
__KERNEL_RCSID(0, "$NetBSD: cd9660_vnops.c,v 1.1 2002/12/23 17:52:09 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -61,11 +61,11 @@ __KERNEL_RCSID(0, "$NetBSD: cd9660_vnops.c,v 1.72 2002/10/23 09:14:11 jdolecek E
#include <miscfs/genfs/genfs.h>
#include <miscfs/specfs/specdev.h>
#include <isofs/cd9660/iso.h>
#include <isofs/cd9660/cd9660_extern.h>
#include <isofs/cd9660/cd9660_node.h>
#include <isofs/cd9660/iso_rrip.h>
#include <isofs/cd9660/cd9660_mount.h>
#include <fs/cd9660/iso.h>
#include <fs/cd9660/cd9660_extern.h>
#include <fs/cd9660/cd9660_node.h>
#include <fs/cd9660/iso_rrip.h>
#include <fs/cd9660/cd9660_mount.h>
/*
* Structure for reading directories

11
sys/fs/cd9660/files.cd9660 Normal file
View File

@ -0,0 +1,11 @@
# $NetBSD: files.cd9660,v 1.1 2002/12/23 17:52:09 jdolecek Exp $
deffs CD9660
file fs/cd9660/cd9660_bmap.c cd9660
file fs/cd9660/cd9660_lookup.c cd9660
file fs/cd9660/cd9660_node.c cd9660
file fs/cd9660/cd9660_rrip.c cd9660
file fs/cd9660/cd9660_util.c cd9660
file fs/cd9660/cd9660_vfsops.c cd9660
file fs/cd9660/cd9660_vnops.c cd9660

2
sys/isofs/cd9660/iso.h → sys/fs/cd9660/iso.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: iso.h,v 1.22 1999/07/13 11:12:06 scw Exp $ */
/* $NetBSD: iso.h,v 1.1 2002/12/23 17:52:10 jdolecek Exp $ */
/*-
* Copyright (c) 1994

2
sys/isofs/cd9660/iso_rrip.h → sys/fs/cd9660/iso_rrip.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: iso_rrip.h,v 1.3 1994/06/29 06:32:02 cgd Exp $ */
/* $NetBSD: iso_rrip.h,v 1.1 2002/12/23 17:52:10 jdolecek Exp $ */
/*-
* Copyright (c) 1993, 1994

7
sys/isofs/Makefile
View File

@ -1,7 +0,0 @@
# $NetBSD: Makefile,v 1.2 2002/11/26 23:30:31 lukem Exp $
SUBDIR= cd9660
INCSDIR= /usr/include/isofs
.include <bsd.kinc.mk>

11
sys/isofs/cd9660/files.cd9660
View File

@ -1,11 +0,0 @@
# $NetBSD: files.cd9660,v 1.1 2002/04/16 23:14:06 thorpej Exp $
deffs CD9660
file isofs/cd9660/cd9660_bmap.c cd9660
file isofs/cd9660/cd9660_lookup.c cd9660
file isofs/cd9660/cd9660_node.c cd9660
file isofs/cd9660/cd9660_rrip.c cd9660
file isofs/cd9660/cd9660_util.c cd9660
file isofs/cd9660/cd9660_vfsops.c cd9660
file isofs/cd9660/cd9660_vnops.c cd9660

4
sys/lkm/vfs/cd9660/Makefile
View File

@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.1 2002/12/23 17:45:14 jdolecek Exp $
# $NetBSD: Makefile,v 1.2 2002/12/23 17:52:04 jdolecek Exp $
.include "../Makefile.inc"
.PATH: $S/isofs/cd9660 ${.CURDIR}/../..
.PATH: $S/fs/cd9660 ${.CURDIR}/../..
KMOD= cd9660