diff options
| author | kmacy <kmacy@FreeBSD.org> | 2006-11-13 05:51:22 +0000 |
|---|---|---|
| committer | kmacy <kmacy@FreeBSD.org> | 2006-11-13 05:51:22 +0000 |
| commit | 0c00ea16dbadcde1937dfc2bef577820b762e95a (patch) | |
| tree | c2c7577af1d9350da736e5ba02f23f6df8c9f273 /sys/fs | |
| parent | c07fe38e024b8eb9ed43c77f898e85cf8c488928 (diff) | |
| download | FreeBSD-src-0c00ea16dbadcde1937dfc2bef577820b762e95a.zip FreeBSD-src-0c00ea16dbadcde1937dfc2bef577820b762e95a.tar.gz | |
change vop_lock handling to allowing tracking of callers' file and line for
acquisition of lockmgr locks
Approved by: scottl (standing in for mentor rwatson)
Diffstat (limited to 'sys/fs')
| -rw-r--r-- | sys/fs/coda/coda_vnops.c | 4 | ||||
| -rw-r--r-- | sys/fs/coda/coda_vnops.h | 2 | ||||
| -rw-r--r-- | sys/fs/nullfs/null_vnops.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sys/fs/coda/coda_vnops.c b/sys/fs/coda/coda_vnops.c index 75de19f..c35dda8 100644 --- a/sys/fs/coda/coda_vnops.c +++ b/sys/fs/coda/coda_vnops.c @@ -129,7 +129,7 @@ struct vop_vector coda_vnodeops = { .vop_readlink = coda_readlink, /* readlink */ .vop_inactive = coda_inactive, /* inactive */ .vop_reclaim = coda_reclaim, /* reclaim */ - .vop_lock = coda_lock, /* lock */ + ._vop_lock = coda_lock, /* lock */ .vop_unlock = coda_unlock, /* unlock */ .vop_bmap = coda_bmap, /* bmap */ .vop_print = VOP_PANIC, /* print */ @@ -1627,7 +1627,7 @@ coda_reclaim(struct vop_reclaim_args *ap) } int -coda_lock(struct vop_lock_args *ap) +coda_lock(struct _vop_lock_args *ap) { /* true args */ struct vnode *vp = ap->a_vp; diff --git a/sys/fs/coda/coda_vnops.h b/sys/fs/coda/coda_vnops.h index db8e3f8..fb79a18 100644 --- a/sys/fs/coda/coda_vnops.h +++ b/sys/fs/coda/coda_vnops.h @@ -72,7 +72,7 @@ vop_readdir_t coda_readdir; vop_bmap_t coda_bmap; vop_strategy_t coda_strategy; vop_reclaim_t coda_reclaim; -vop_lock_t coda_lock; +_vop_lock_t coda_lock; vop_unlock_t coda_unlock; vop_islocked_t coda_islocked; int coda_vop_error(void *); diff --git a/sys/fs/nullfs/null_vnops.c b/sys/fs/nullfs/null_vnops.c index f2261f9..4459fe1 100644 --- a/sys/fs/nullfs/null_vnops.c +++ b/sys/fs/nullfs/null_vnops.c @@ -510,7 +510,7 @@ null_rename(struct vop_rename_args *ap) * vnodes below us on the stack. */ static int -null_lock(struct vop_lock_args *ap) +null_lock(struct _vop_lock_args *ap) { struct vnode *vp = ap->a_vp; int flags = ap->a_flags; @@ -719,7 +719,7 @@ struct vop_vector null_vnodeops = { .vop_getwritemount = null_getwritemount, .vop_inactive = null_inactive, .vop_islocked = null_islocked, - .vop_lock = null_lock, + ._vop_lock = null_lock, .vop_lookup = null_lookup, .vop_open = null_open, .vop_print = null_print, |
