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

make fs types consistent over new kernels. also, some proto foo.

This commit is contained in:
cgd 1994-04-23 07:54:38 +00:00
parent 3ffc74d2d4
commit 4917d8beec
11 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/isofs/isofs_vfsops.c
View File

@ -1,5 +1,5 @@
/*
* $Id: isofs_vfsops.c,v 1.12 1994/04/21 07:47:31 cgd Exp $
* $Id: isofs_vfsops.c,v 1.13 1994/04/23 07:54:38 cgd Exp $
*/
#include <sys/param.h>
@ -280,7 +280,7 @@ static iso_mountfs(devvp, mp, p, argp)
mp->mnt_data = (qaddr_t)isomp;
mp->mnt_stat.f_fsid.val[0] = (long)dev;
mp->mnt_stat.f_fsid.val[1] = (long)MOUNT_ISOFS;
mp->mnt_stat.f_fsid.val[1] = makefstype(MOUNT_ISOFS);
mp->mnt_flag |= MNT_LOCAL;
isomp->im_mountp = mp;
isomp->im_dev = dev;

2
sys/kern/vfs_subr.c
View File

@ -1 +1 @@
revision 1.24 intentionally removed
revision 1.25 intentionally removed

4
sys/miscfs/fdesc/fdesc_vfsops.c
View File

@ -37,7 +37,7 @@
* From:
* Id: fdesc_vfsops.c,v 4.1 1993/12/17 10:47:45 jsp Rel
*
* $Id: fdesc_vfsops.c,v 1.10 1994/04/21 07:48:40 cgd Exp $
* $Id: fdesc_vfsops.c,v 1.11 1994/04/23 07:54:51 cgd Exp $
*/
/*
@ -107,7 +107,7 @@ fdesc_mount(mp, path, data, ndp, p)
fmp->f_root = rvp;
/* mp->mnt_flag |= MNT_LOCAL; */
mp->mnt_data = (qaddr_t) fmp;
getnewfsid(mp, (int)MOUNT_FDESC);
getnewfsid(mp, makefstype(MOUNT_FDESC));
(void) copyinstr(path, mp->mnt_stat.f_mntonname, MNAMELEN - 1, &size);
bzero(mp->mnt_stat.f_mntonname + size, MNAMELEN - size);

4
sys/miscfs/kernfs/kernfs_vfsops.c
View File

@ -37,7 +37,7 @@
* From:
* Id: kernfs_vfsops.c,v 4.1 1994/01/02 14:42:00 jsp Exp
*
* $Id: kernfs_vfsops.c,v 1.13 1994/04/21 07:48:43 cgd Exp $
* $Id: kernfs_vfsops.c,v 1.14 1994/04/23 07:54:55 cgd Exp $
*/
/*
@ -135,7 +135,7 @@ kernfs_mount(mp, path, data, ndp, p)
fmp->kf_root = rvp;
mp->mnt_flag |= MNT_LOCAL;
mp->mnt_data = (qaddr_t) fmp;
getnewfsid(mp, (int)MOUNT_KERNFS);
getnewfsid(mp, makefstype(MOUNT_KERNFS));
(void) copyinstr(path, mp->mnt_stat.f_mntonname, MNAMELEN - 1, &size);
bzero(mp->mnt_stat.f_mntonname + size, MNAMELEN - size);

4
sys/miscfs/lofs/lofs_vfsops.c
View File

@ -37,7 +37,7 @@
* From:
* Id: lofs_vfsops.c,v 4.1 1993/12/17 10:47:45 jsp Rel
*
* $Id: lofs_vfsops.c,v 1.4 1994/04/21 07:48:45 cgd Exp $
* $Id: lofs_vfsops.c,v 1.5 1994/04/23 07:54:58 cgd Exp $
*/
/*
@ -153,7 +153,7 @@ lofs_mount(mp, path, data, ndp, p)
if (LOFSVP(rootvp)->v_mount->mnt_flag & MNT_LOCAL)
mp->mnt_flag |= MNT_LOCAL;
mp->mnt_data = (qaddr_t) amp;
getnewfsid(mp, (int)MOUNT_LOFS);
getnewfsid(mp, makefstype(MOUNT_LOFS));
(void) copyinstr(path, mp->mnt_stat.f_mntonname, MNAMELEN - 1, &size);
bzero(mp->mnt_stat.f_mntonname + size, MNAMELEN - size);

4
sys/miscfs/portal/portal_vfsops.c
View File

@ -37,7 +37,7 @@
* From:
* Id: portal_vfsops.c,v 1.6 1993/09/22 17:57:30 jsp Exp
*
* $Id: portal_vfsops.c,v 1.3 1994/04/21 07:48:48 cgd Exp $
* $Id: portal_vfsops.c,v 1.4 1994/04/23 07:55:00 cgd Exp $
*/
/*
@ -131,7 +131,7 @@ portal_mount(mp, path, data, ndp, p)
/* mp->mnt_flag |= MNT_LOCAL; */
mp->mnt_data = (qaddr_t) fmp;
getnewfsid(mp, (int)MOUNT_PORTAL);
getnewfsid(mp, makefstype(MOUNT_PORTAL));
(void) copyinstr(path, mp->mnt_stat.f_mntonname, MNAMELEN - 1, &size);
bzero(mp->mnt_stat.f_mntonname + size, MNAMELEN - size);

4
sys/miscfs/procfs/procfs_vfsops.c
View File

@ -37,7 +37,7 @@
* From:
* Id: procfs_vfsops.c,v 4.1 1993/12/17 10:47:45 jsp Rel
*
* $Id: procfs_vfsops.c,v 1.14 1994/04/21 07:48:52 cgd Exp $
* $Id: procfs_vfsops.c,v 1.15 1994/04/23 07:55:03 cgd Exp $
*/
/*
@ -83,7 +83,7 @@ procfs_mount(mp, path, data, ndp, p)
/* mp->mnt_flag |= MNT_LOCAL; */
mp->mnt_data = 0;
getnewfsid(mp, (int)MOUNT_PROCFS);
getnewfsid(mp, makefstype(MOUNT_PROCFS));
(void) copyinstr(path, (caddr_t)mp->mnt_stat.f_mntonname, MNAMELEN, &size);
bzero(mp->mnt_stat.f_mntonname + size, MNAMELEN - size);

4
sys/msdosfs/msdosfs_vfsops.c
View File

@ -13,7 +13,7 @@
*
* October 1992
*
* $Id: msdosfs_vfsops.c,v 1.12 1994/04/21 07:48:59 cgd Exp $
* $Id: msdosfs_vfsops.c,v 1.13 1994/04/23 07:55:07 cgd Exp $
*/
#include <sys/param.h>
@ -416,7 +416,7 @@ mountmsdosfs(devvp, mp, p)
pmp->pm_fmod = 1;
mp->mnt_data = (qaddr_t) pmp;
mp->mnt_stat.f_fsid.val[0] = (long)dev;
mp->mnt_stat.f_fsid.val[1] = (long)MOUNT_MSDOS;
mp->mnt_stat.f_fsid.val[1] = makefstype(MOUNT_MSDOS);
mp->mnt_flag |= MNT_LOCAL;
#if defined(QUOTA)
/*

4
sys/nfs/nfs_vfsops.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)nfs_vfsops.c 7.31 (Berkeley) 5/6/91
* $Id: nfs_vfsops.c,v 1.16 1994/04/21 07:49:11 cgd Exp $
* $Id: nfs_vfsops.c,v 1.17 1994/04/23 07:55:13 cgd Exp $
*/
#include <sys/param.h>
@ -448,7 +448,7 @@ mountnfs(argp, mp, nam, pth, hst, vpp)
bzero((caddr_t)nmp, sizeof *nmp);
mp->mnt_data = (qaddr_t)nmp;
getnewfsid(mp, (int)MOUNT_NFS);
getnewfsid(mp, makefstype(MOUNT_NFS));
nmp->nm_mountp = mp;
nmp->nm_rto = NFS_TIMEO;
nmp->nm_rtt = -1;

6
sys/sys/mount.h
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* from: @(#)mount.h 7.22 (Berkeley) 6/3/91
* $Id: mount.h,v 1.27 1994/04/21 07:49:23 cgd Exp $
* $Id: mount.h,v 1.28 1994/04/23 07:55:23 cgd Exp $
*/
#ifndef _SYS_MOUNT_H_
@ -306,10 +306,12 @@ struct msdosfs_args {
/*
* exported vnode operations
*/
struct mount *getvfs __P((fsid_t *fsid)); /* return vfs given fsid */
void getnewfsid __P((struct mount *mp, int mtype)); /* get a uniqe fsid */
long makefstype __P((char *type)); /* mnt type -> 'unique' number */
void vfs_remove __P((struct mount *mp)); /* remove a vfs from mount list */
int vfs_lock __P((struct mount *mp)); /* lock a vfs */
void vfs_unlock __P((struct mount *mp)); /* unlock a vfs */
struct mount *getvfs __P((fsid_t *fsid)); /* return vfs given fsid */
struct mount *rootfs; /* ptr to root mount structure */
extern TAILQ_HEAD(mntlist, mount) mountlist; /* mounted filesystem list */
extern struct vfsops *vfssw[]; /* mount filesystem type table */

2
sys/ufs/ufs_vfsops.c
View File

@ -1 +1 @@
revision 1.10 intentionally removed
revision 1.11 intentionally removed