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

Name the vnode method vectors consistently with the rest of the filesystems.

Browse Source 
This improves the output of src/tools/tools/vop_table
This commit is contained in:
phk 2003-09-12 16:44:40 +00:00
parent 13dcce3f18
commit 0e80d17900
4 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/nfsclient/nfs_node.c
View File

@ -226,7 +226,7 @@ nfs_nget(struct mount *mntp, nfsfh_t *fhp, int fhsize, struct nfsnode **npp)
*/
np = uma_zalloc(nfsnode_zone, M_WAITOK);
error = getnewvnode("nfs", mntp, nfsv2_vnodeop_p, &nvp);
error = getnewvnode("nfs", mntp, nfs_vnodeop_p, &nvp);
if (error) {
if (nfs_node_hash_lock < 0)
wakeup(&nfs_node_hash_lock);

4
sys/nfsclient/nfs_subs.c
View File

@ -527,10 +527,10 @@ nfs_loadattrcache(struct vnode **vpp, struct mbuf **mdp, caddr_t *dposp,
if (vp->v_type != vtyp) {
vp->v_type = vtyp;
if (vp->v_type == VFIFO) {
vp->v_op = fifo_nfsv2nodeop_p;
vp->v_op = fifo_nfsnodeop_p;
}
if (vp->v_type == VCHR || vp->v_type == VBLK) {
vp->v_op = spec_nfsv2nodeop_p;
vp->v_op = spec_nfsnodeop_p;
vp = addaliasu(vp, rdev);
np->n_vnode = vp;
}

30
sys/nfsclient/nfs_vnops.c
View File

@ -135,8 +135,8 @@ static int nfs_advlock(struct vop_advlock_args *);
/*
* Global vfs data structures for nfs
*/
vop_t **nfsv2_vnodeop_p;
static struct vnodeopv_entry_desc nfsv2_vnodeop_entries[] = {
vop_t **nfs_vnodeop_p;
static struct vnodeopv_entry_desc nfs_vnodeop_entries[] = {
{ &vop_default_desc, (vop_t *) vop_defaultop },
{ &vop_access_desc, (vop_t *) nfs_access },
{ &vop_advlock_desc, (vop_t *) nfs_advlock },
@ -168,15 +168,15 @@ static struct vnodeopv_entry_desc nfsv2_vnodeop_entries[] = {
{ &vop_write_desc, (vop_t *) nfs_write },
{ NULL, NULL }
};
static struct vnodeopv_desc nfsv2_vnodeop_opv_desc =
{ &nfsv2_vnodeop_p, nfsv2_vnodeop_entries };
VNODEOP_SET(nfsv2_vnodeop_opv_desc);
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_nfsv2nodeop_p;
static struct vnodeopv_entry_desc nfsv2_specop_entries[] = {
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 },
@ -191,12 +191,12 @@ static struct vnodeopv_entry_desc nfsv2_specop_entries[] = {
{ &vop_write_desc, (vop_t *) nfsspec_write },
{ NULL, NULL }
};
static struct vnodeopv_desc spec_nfsv2nodeop_opv_desc =
{ &spec_nfsv2nodeop_p, nfsv2_specop_entries };
VNODEOP_SET(spec_nfsv2nodeop_opv_desc);
static struct vnodeopv_desc spec_nfsnodeop_opv_desc =
{ &spec_nfsnodeop_p, nfs_specop_entries };
VNODEOP_SET(spec_nfsnodeop_opv_desc);
vop_t **fifo_nfsv2nodeop_p;
static struct vnodeopv_entry_desc nfsv2_fifoop_entries[] = {
vop_t **fifo_nfsnodeop_p;
static struct vnodeopv_entry_desc nfs_fifoop_entries[] = {
{ &vop_default_desc, (vop_t *) fifo_vnoperate },
{ &vop_access_desc, (vop_t *) nfsspec_access },
{ &vop_close_desc, (vop_t *) nfsfifo_close },
@ -211,9 +211,9 @@ static struct vnodeopv_entry_desc nfsv2_fifoop_entries[] = {
{ &vop_write_desc, (vop_t *) nfsfifo_write },
{ NULL, NULL }
};
static struct vnodeopv_desc fifo_nfsv2nodeop_opv_desc =
{ &fifo_nfsv2nodeop_p, nfsv2_fifoop_entries };
VNODEOP_SET(fifo_nfsv2nodeop_opv_desc);
static struct vnodeopv_desc fifo_nfsnodeop_opv_desc =
{ &fifo_nfsnodeop_p, nfs_fifoop_entries };
VNODEOP_SET(fifo_nfsnodeop_opv_desc);
static int nfs_mknodrpc(struct vnode *dvp, struct vnode **vpp,
struct componentname *cnp, struct vattr *vap);

6
sys/nfsclient/nfsnode.h
View File

@ -178,9 +178,9 @@ nfs_rsunlock(struct nfsnode *np, struct thread *td)
(void)lockmgr(&np->n_rslock, LK_RELEASE, NULL, td);
}
extern vop_t **fifo_nfsv2nodeop_p;
extern vop_t **nfsv2_vnodeop_p;
extern vop_t **spec_nfsv2nodeop_p;
extern vop_t **fifo_nfsnodeop_p;
extern vop_t **nfs_vnodeop_p;
extern vop_t **spec_nfsnodeop_p;
/*
* Prototypes for NFS vnode operations