d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GC some KSE compatiblity macros that were somehow still here.

Browse Source
This commit is contained in:
John Baldwin 2001-11-26 23:52:35 +00:00
parent 8a918adb2b
commit cfaffc10b5
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=86928
2 changed files with 23 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sys/fs/hpfs/hpfs_vfsops.c
View File

@ -53,21 +53,16 @@
MALLOC_DEFINE(M_HPFSMNT, "HPFS mount", "HPFS mount structure");
MALLOC_DEFINE(M_HPFSNO, "HPFS node", "HPFS node structure");
/* XXXKSE */
#define a_p a_td
#define cn_proc cn_thread
#define proc thread
struct sockaddr;
static int hpfs_root __P((struct mount *, struct vnode **));
static int hpfs_statfs __P((struct mount *, struct statfs *,
struct proc *));
static int hpfs_unmount __P((struct mount *, int, struct proc *));
struct thread *));
static int hpfs_unmount __P((struct mount *, int, struct thread *));
static int hpfs_vget __P((struct mount *mp, ino_t ino,
struct vnode **vpp));
static int hpfs_mountfs __P((register struct vnode *, struct mount *,
struct hpfs_args *, struct proc *));
struct hpfs_args *, struct thread *));
static int hpfs_vptofh __P((struct vnode *, struct fid *));
static int hpfs_fhtovp __P((struct mount *, struct fid *,
struct vnode **));
@ -100,7 +95,7 @@ hpfs_mount (
char *path,
caddr_t data,
struct nameidata *ndp,
struct proc *p )
struct thread *p )
{
u_int size;
int err = 0;
@ -217,7 +212,7 @@ hpfs_mountfs(devvp, mp, argsp, p)
register struct vnode *devvp;
struct mount *mp;
struct hpfs_args *argsp;
struct proc *p;
struct thread *p;
{
int error, ncount, ronly;
struct sublock *sup;
@ -337,7 +332,7 @@ static int
hpfs_unmount(
struct mount *mp,
int mntflags,
struct proc *p)
struct thread *p)
{
int error, flags, ronly;
register struct hpfsmount *hpmp = VFSTOHPFS(mp);
@ -398,7 +393,7 @@ static int
hpfs_statfs(
struct mount *mp,
struct statfs *sbp,
struct proc *p)
struct thread *p)
{
struct hpfsmount *hpmp = VFSTOHPFS(mp);

37
sys/fs/hpfs/hpfs_vnops.c
View File

@ -57,11 +57,6 @@
#include <fs/hpfs/hpfs_subr.h>
#include <fs/hpfs/hpfs_ioctl.h>
/* XXXKSE */
#define a_p a_td
#define cn_proc cn_thread
#define proc thread
static int hpfs_de_uiomove __P((struct hpfsmount *, struct hpfsdirent *,
struct uio *));
static int hpfs_ioctl __P((struct vop_ioctl_args *ap));
@ -140,7 +135,7 @@ hpfs_ioctl (
caddr_t a_data;
int a_fflag;
struct ucred *a_cred;
struct proc *a_p;
struct thread *a_td;
} */ *ap)
{
register struct vnode *vp = ap->a_vp;
@ -450,7 +445,7 @@ hpfs_getattr(ap)
struct vnode *a_vp;
struct vattr *a_vap;
struct ucred *a_cred;
struct proc *a_p;
struct thread *a_td;
} */ *ap;
{
register struct vnode *vp = ap->a_vp;
@ -498,14 +493,14 @@ hpfs_setattr(ap)
struct vnode *a_vp;
struct vattr *a_vap;
struct ucred *a_cred;
struct proc *a_p;
struct thread *a_td;
} */ *ap;
{
struct vnode *vp = ap->a_vp;
struct hpfsnode *hp = VTOHP(vp);
struct vattr *vap = ap->a_vap;
struct ucred *cred = ap->a_cred;
struct proc *p = ap->a_p;
struct thread *p = ap->a_td;
int error;
dprintf(("hpfs_setattr(0x%x):\n", hp->h_no));
@ -621,12 +616,12 @@ hpfs_inactive(ap)
vprint("hpfs_inactive: pushing active", vp);
if (hp->h_flag & H_INVAL) {
VOP__UNLOCK(vp,0,ap->a_p);
VOP__UNLOCK(vp,0,ap->a_td);
vrecycle(vp, NULL, ap->a_td);
return (0);
}
VOP__UNLOCK(vp,0,ap->a_p);
VOP__UNLOCK(vp,0,ap->a_td);
return (0);
}
@ -730,7 +725,7 @@ hpfs_access(ap)
struct vnode *a_vp;
int a_mode;
struct ucred *a_cred;
struct proc *a_p;
struct thread *a_td;
} */ *ap;
{
struct vnode *vp = ap->a_vp;
@ -771,7 +766,7 @@ hpfs_open(ap)
struct vnode *a_vp;
int a_mode;
struct ucred *a_cred;
struct proc *a_p;
struct thread *a_td;
} */ *ap;
{
#if HPFS_DEBUG
@ -800,7 +795,7 @@ hpfs_close(ap)
struct vnode *a_vp;
int a_fflag;
struct ucred *a_cred;
struct proc *a_p;
struct thread *a_td;
} */ *ap;
{
#if HPFS_DEBUG
@ -1092,7 +1087,7 @@ hpfs_lookup(ap)
return (EOPNOTSUPP);
}
error = VOP_ACCESS(dvp, VEXEC, cred, cnp->cn_proc);
error = VOP_ACCESS(dvp, VEXEC, cred, cnp->cn_thread);
if(error)
return (error);
@ -1109,17 +1104,17 @@ hpfs_lookup(ap)
dprintf(("hpfs_lookup(0x%x,...): .. faked (0x%x)\n",
dhp->h_no, dhp->h_fn.fn_parent));
VOP__UNLOCK(dvp,0,cnp->cn_proc);
VOP__UNLOCK(dvp,0,cnp->cn_thread);
error = VFS_VGET(hpmp->hpm_mp,
dhp->h_fn.fn_parent, ap->a_vpp);
if(error) {
VOP__LOCK(dvp, 0, cnp->cn_proc);
VOP__LOCK(dvp, 0, cnp->cn_thread);
return(error);
}
if( lockparent && (flags & ISLASTCN) &&
(error = VOP__LOCK(dvp, 0, cnp->cn_proc)) ) {
(error = VOP__LOCK(dvp, 0, cnp->cn_thread)) ) {
vput( *(ap->a_vpp) );
return (error);
}
@ -1135,7 +1130,7 @@ hpfs_lookup(ap)
if ((error == ENOENT) && (flags & ISLASTCN) &&
(nameiop == CREATE || nameiop == RENAME)) {
if(!lockparent)
VOP__UNLOCK(dvp, 0, cnp->cn_proc);
VOP__UNLOCK(dvp, 0, cnp->cn_thread);
cnp->cn_flags |= SAVENAME;
return (EJUSTRETURN);
}
@ -1147,7 +1142,7 @@ hpfs_lookup(ap)
dep->de_fnode, dep->de_cpid));
if (nameiop == DELETE && (flags & ISLASTCN)) {
error = VOP_ACCESS(dvp, VWRITE, cred, cnp->cn_proc);
error = VOP_ACCESS(dvp, VWRITE, cred, cnp->cn_thread);
if (error) {
brelse(bp);
return (error);
@ -1181,7 +1176,7 @@ hpfs_lookup(ap)
brelse(bp);
if(!lockparent || !(flags & ISLASTCN))
VOP__UNLOCK(dvp, 0, cnp->cn_proc);
VOP__UNLOCK(dvp, 0, cnp->cn_thread);
if ((flags & MAKEENTRY) &&
(!(flags & ISLASTCN) ||
(nameiop != DELETE && nameiop != CREATE)))