diff options
| author | njl <njl@FreeBSD.org> | 2002-09-14 09:02:28 +0000 |
|---|---|---|
| committer | njl <njl@FreeBSD.org> | 2002-09-14 09:02:28 +0000 |
| commit | 0590c43070aac7fb636a1f4c4b94469046a317a0 (patch) | |
| tree | e9205d0e4985af46af0db4bd26e9662b1c25f85b /sys/fs/unionfs | |
| parent | bb76739de046ae1f81a36e96d18f0ee3b1afd323 (diff) | |
| download | FreeBSD-src-0590c43070aac7fb636a1f4c4b94469046a317a0.zip FreeBSD-src-0590c43070aac7fb636a1f4c4b94469046a317a0.tar.gz | |
Remove all use of vnode->v_tag, replacing with appropriate substitutes.
v_tag is now const char * and should only be used for debugging.
Additionally:
1. All users of VT_NTS now check vfsconf->vf_type VFCF_NETWORK
2. The user of VT_PROCFS now checks for the new flag VV_PROCDEP, which
is propagated by pseudofs to all child vnodes if the fs sets PFS_PROCDEP.
Suggested by: phk
Reviewed by: bde, rwatson (earlier version)
Diffstat (limited to 'sys/fs/unionfs')
| -rw-r--r-- | sys/fs/unionfs/union_subr.c | 5 | ||||
| -rw-r--r-- | sys/fs/unionfs/union_vnops.c | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/sys/fs/unionfs/union_subr.c b/sys/fs/unionfs/union_subr.c index 66a4013..25094aa 100644 --- a/sys/fs/unionfs/union_subr.c +++ b/sys/fs/unionfs/union_subr.c @@ -443,7 +443,8 @@ loop: do { scan = VTOUNION(scan)->un_pvp; - } while (scan && scan->v_tag == VT_UNION && scan != dvp); + } while (scan && scan->v_op == union_vnodeop_p && + scan != dvp); if (scan != dvp) { /* * our new un is above dvp (we never saw dvp @@ -545,7 +546,7 @@ loop: * Create new node rather then replace old node */ - error = getnewvnode(VT_UNION, mp, union_vnodeop_p, vpp); + error = getnewvnode("union", mp, union_vnodeop_p, vpp); if (error) { /* * If an error occurs clear out vnodes. diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c index 227e817..92d92ed 100644 --- a/sys/fs/unionfs/union_vnops.c +++ b/sys/fs/unionfs/union_vnops.c @@ -1832,8 +1832,8 @@ union_print(ap) { struct vnode *vp = ap->a_vp; - printf("\ttag VT_UNION, vp=%p, uppervp=%p, lowervp=%p\n", - vp, UPPERVP(vp), LOWERVP(vp)); + printf("\ttag %s, vp=%p, uppervp=%p, lowervp=%p\n", vp->v_tag, + vp, UPPERVP(vp), LOWERVP(vp)); if (UPPERVP(vp) != NULLVP) vprint("union: upper", UPPERVP(vp)); if (LOWERVP(vp) != NULLVP) |
