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

Remove support for using NFS device nodes.

Browse Source
This commit is contained in:
phk 2004-09-28 08:50:01 +00:00
parent 5b9c332a3c
commit d3ceec948f
3 changed files with 2 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/nfsclient/nfs_subs.c
View File

@ -544,13 +544,6 @@ nfs_loadattrcache(struct vnode **vpp, struct mbuf **mdp, caddr_t *dposp,
vp->v_type = vtyp;
if (vp->v_type == VFIFO)
vp->v_op = fifo_nfsnodeop_p;
else if (vp->v_type == VBLK)
vp->v_op = spec_nfsnodeop_p;
else if (vp->v_type == VCHR) {
vp->v_op = spec_nfsnodeop_p;
vp = addaliasu(vp, rdev);
np->n_vnode = vp;
}
np->n_mtime = mtime.tv_sec;
}
vap = &np->n_vattr;

91
sys/nfsclient/nfs_vnops.c
View File

@ -93,11 +93,8 @@ __FBSDID("$FreeBSD$");
#define vfs_busy_pages(bp, f)
#endif
static int nfsspec_read(struct vop_read_args *);
static int nfsspec_write(struct vop_write_args *);
static int nfsfifo_read(struct vop_read_args *);
static int nfsfifo_write(struct vop_write_args *);
static int nfsspec_close(struct vop_close_args *);
static int nfsfifo_close(struct vop_close_args *);
static int nfs_flush(struct vnode *, struct ucred *, int, struct thread *,
int);
@ -169,28 +166,6 @@ static struct vnodeopv_desc nfs_vnodeop_opv_desc =
{ &nfs_vnodeop_p, nfs_vnodeop_entries };
VNODEOP_SET(nfs_vnodeop_opv_desc);
/*
* Special device vnode ops
*/
vop_t **spec_nfsnodeop_p;
static struct vnodeopv_entry_desc nfs_specop_entries[] = {
{ &vop_default_desc, (vop_t *) spec_vnoperate },
{ &vop_access_desc, (vop_t *) nfsspec_access },
{ &vop_close_desc, (vop_t *) nfsspec_close },
{ &vop_fsync_desc, (vop_t *) nfs_fsync },
{ &vop_getattr_desc, (vop_t *) nfs_getattr },
{ &vop_inactive_desc, (vop_t *) nfs_inactive },
{ &vop_print_desc, (vop_t *) nfs_print },
{ &vop_read_desc, (vop_t *) nfsspec_read },
{ &vop_reclaim_desc, (vop_t *) nfs_reclaim },
{ &vop_setattr_desc, (vop_t *) nfs_setattr },
{ &vop_write_desc, (vop_t *) nfsspec_write },
{ NULL, NULL }
};
static struct vnodeopv_desc spec_nfsnodeop_opv_desc =
{ &spec_nfsnodeop_p, nfs_specop_entries };
VNODEOP_SET(spec_nfsnodeop_opv_desc);
vop_t **fifo_nfsnodeop_p;
static struct vnodeopv_entry_desc nfs_fifoop_entries[] = {
{ &vop_default_desc, (vop_t *) fifo_vnoperate },
@ -429,12 +404,9 @@ nfs_open(struct vop_open_args *ap)
struct vattr vattr;
int error;
if (vp->v_type != VREG && vp->v_type != VDIR && vp->v_type != VLNK) {
#ifdef DIAGNOSTIC
printf("open eacces vtyp=%d\n", vp->v_type);
#endif
if (vp->v_type != VREG && vp->v_type != VDIR && vp->v_type != VLNK)
return (EOPNOTSUPP);
}
/*
* Get a valid lease. If cached data is stale, flush it.
*/
@ -3022,65 +2994,6 @@ nfsspec_access(struct vop_access_args *ap)
mode, cred, NULL));
}
/*
* Read wrapper for special devices.
*/
static int
nfsspec_read(struct vop_read_args *ap)
{
struct nfsnode *np = VTONFS(ap->a_vp);
/*
* Set access flag.
*/
np->n_flag |= NACC;
getnanotime(&np->n_atim);
return (VOCALL(spec_vnodeop_p, VOFFSET(vop_read), ap));
}
/*
* Write wrapper for special devices.
*/
static int
nfsspec_write(struct vop_write_args *ap)
{
struct nfsnode *np = VTONFS(ap->a_vp);
/*
* Set update flag.
*/
np->n_flag |= NUPD;
getnanotime(&np->n_mtim);
return (VOCALL(spec_vnodeop_p, VOFFSET(vop_write), ap));
}
/*
* Close wrapper for special devices.
*
* Update the times on the nfsnode then do device close.
*/
static int
nfsspec_close(struct vop_close_args *ap)
{
struct vnode *vp = ap->a_vp;
struct nfsnode *np = VTONFS(vp);
struct vattr vattr;
if (np->n_flag & (NACC | NUPD)) {
np->n_flag |= NCHG;
if (vrefcnt(vp) == 1 &&
(vp->v_mount->mnt_flag & MNT_RDONLY) == 0) {
VATTR_NULL(&vattr);
if (np->n_flag & NACC)
vattr.va_atime = np->n_atim;
if (np->n_flag & NUPD)
vattr.va_mtime = np->n_mtim;
(void)VOP_SETATTR(vp, &vattr, ap->a_cred, ap->a_td);
}
}
return (VOCALL(spec_vnodeop_p, VOFFSET(vop_close), ap));
}
/*
* Read wrapper for fifos.
*/

1
sys/nfsclient/nfsnode.h
View File

@ -193,7 +193,6 @@ nfs_rsunlock(struct nfsnode *np, struct thread *td)
extern vop_t **fifo_nfsnodeop_p;
extern vop_t **nfs_vnodeop_p;
extern vop_t **spec_nfsnodeop_p;
#if 0
extern vop_t **fifo_nfs4nodeop_p;