bfbb9ce670
udev_t in the kernel but still called dev_t in userland.
Provide functions to manipulate both types:
major() umajor()
minor() uminor()
makedev() umakedev()
dev2udev() udev2dev()
For now they're functions, they will become in-line functions
after one of the next two steps in this process.
Return major/minor/makedev to macro-hood for userland.
Register a name in cdevsw[] for the "filedescriptor" driver.
In the kernel the udev_t appears in places where we have the
major/minor number combination, (ie: a potential device: we
may not have the driver nor the device), like in inodes, vattr,
cdevsw registration and so on, whereas the dev_t appears where
we carry around a reference to a actual device.
In the future the cdevsw and the aliased-from vnode will be hung
directly from the dev_t, along with up to two softc pointers for
the device driver and a few houskeeping bits. This will essentially
replace the current "alias" check code (same buck, bigger bang).
A little stunt has been provided to try to catch places where the
wrong type is being used (dev_t vs udev_t), if you see something
not working, #undef DEVT_FASCIST in kern/kern_conf.c and see if
it makes a difference. If it does, please try to track it down
(many hands make light work) or at least try to reproduce it
as simply as possible, and describe how to do that.
Without DEVT_FASCIST I belive this patch is a no-op.
Stylistic/posixoid comments about the userland view of the <sys/*.h>
files welcome now, from userland they now contain the end result.
Next planned step: make all dev_t's refer to the same devsw[] which
means convert BLK's to CHR's at the perimeter of the vnodes and
other places where they enter the game (bootdev, mknod, sysctl).
127 lines
5.1 KiB
C
127 lines
5.1 KiB
C
/*-
|
|
* Copyright (c) 1994
|
|
* The Regents of the University of California. All rights reserved.
|
|
*
|
|
* This code is derived from software contributed to Berkeley
|
|
* by Pace Willisson (pace@blitz.com). The Rock Ridge Extension
|
|
* Support code is derived from software contributed to Berkeley
|
|
* by Atsushi Murai (amurai@spec.co.jp).
|
|
*
|
|
* 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. All advertising materials mentioning features or use of this software
|
|
* must display the following acknowledgement:
|
|
* This product includes software developed by the University of
|
|
* California, Berkeley and its contributors.
|
|
* 4. 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.
|
|
*
|
|
* @(#)cd9660_node.h 8.6 (Berkeley) 5/14/95
|
|
* $Id: cd9660_node.h,v 1.17 1998/02/03 21:39:30 bde Exp $
|
|
*/
|
|
|
|
/*
|
|
* Theoretically, directories can be more than 2Gb in length,
|
|
* however, in practice this seems unlikely. So, we define
|
|
* the type doff_t as a long to keep down the cost of doing
|
|
* lookup on a 32-bit machine. If you are porting to a 64-bit
|
|
* architecture, you should make doff_t the same as off_t.
|
|
*/
|
|
#define doff_t long
|
|
|
|
typedef struct {
|
|
struct timespec iso_atime; /* time of last access */
|
|
struct timespec iso_mtime; /* time of last modification */
|
|
struct timespec iso_ctime; /* time file changed */
|
|
u_short iso_mode; /* files access mode and type */
|
|
uid_t iso_uid; /* owner user id */
|
|
gid_t iso_gid; /* owner group id */
|
|
short iso_links; /* links of file */
|
|
udev_t iso_rdev; /* Major/Minor number for special */
|
|
} ISO_RRIP_INODE;
|
|
|
|
|
|
struct iso_node {
|
|
struct lock i_lock; /* node lock > Keep this first< */
|
|
struct iso_node *i_next, **i_prev; /* hash chain */
|
|
struct vnode *i_vnode; /* vnode associated with this inode */
|
|
struct vnode *i_devvp; /* vnode for block I/O */
|
|
u_long i_flag; /* see below */
|
|
dev_t i_dev; /* device where inode resides */
|
|
ino_t i_number; /* the identity of the inode */
|
|
/* we use the actual starting block of the file */
|
|
struct iso_mnt *i_mnt; /* filesystem associated with this inode */
|
|
struct lockf *i_lockf; /* head of byte-level lock list */
|
|
doff_t i_endoff; /* end of useful stuff in directory */
|
|
doff_t i_diroff; /* offset in dir, where we found last entry */
|
|
doff_t i_offset; /* offset of free space in directory */
|
|
ino_t i_ino; /* inode number of found directory */
|
|
|
|
long iso_extent; /* extent of file */
|
|
long i_size;
|
|
long iso_start; /* actual start of data of file (may be different */
|
|
/* from iso_extent, if file has extended attributes) */
|
|
ISO_RRIP_INODE inode;
|
|
};
|
|
|
|
#define i_forw i_chain[0]
|
|
#define i_back i_chain[1]
|
|
|
|
/* flags */
|
|
#define IN_ACCESS 0x0020 /* inode access time to be updated */
|
|
|
|
#define VTOI(vp) ((struct iso_node *)(vp)->v_data)
|
|
#define ITOV(ip) ((ip)->i_vnode)
|
|
|
|
#ifdef KERNEL
|
|
|
|
#ifdef MALLOC_DECLARE
|
|
MALLOC_DECLARE(M_ISOFSMNT);
|
|
MALLOC_DECLARE(M_ISOFSNODE);
|
|
#endif
|
|
|
|
struct buf;
|
|
struct vop_bmap_args;
|
|
struct vop_cachedlookup_args;
|
|
struct vop_inactive_args;
|
|
struct vop_reclaim_args;
|
|
|
|
/*
|
|
* Prototypes for ISOFS vnode operations
|
|
*/
|
|
int cd9660_lookup __P((struct vop_cachedlookup_args *));
|
|
int cd9660_inactive __P((struct vop_inactive_args *));
|
|
int cd9660_reclaim __P((struct vop_reclaim_args *));
|
|
int cd9660_bmap __P((struct vop_bmap_args *));
|
|
int cd9660_blkatoff __P((struct vnode *vp, off_t offset, char **res, struct buf **bpp));
|
|
|
|
void cd9660_defattr __P((struct iso_directory_record *,
|
|
struct iso_node *, struct buf *, enum ISO_FTYPE));
|
|
void cd9660_deftstamp __P((struct iso_directory_record *,
|
|
struct iso_node *, struct buf *, enum ISO_FTYPE));
|
|
struct vnode *cd9660_ihashget __P((dev_t, ino_t));
|
|
void cd9660_ihashins __P((struct iso_node *));
|
|
int cd9660_tstamp_conv7 __P((u_char *, struct timespec *, enum ISO_FTYPE));
|
|
int cd9660_tstamp_conv17 __P((u_char *, struct timespec *));
|
|
|
|
#endif /* KERNEL */
|