From 8d92aef50ffbfefe8f47cc159bc02af1964e4556 Mon Sep 17 00:00:00 2001 From: Jim Rees Date: Thu, 3 Jan 2008 17:16:56 +0000 Subject: [PATCH] STABLE14-obsd-lock-vnops-20080103 use generic vnops for lock/unlock (for obsd 4.2) (cherry picked from commit 7793d4e5183993f8c5fa01cf5c099405757fa183) --- src/afs/OBSD/osi_vnodeops.c | 40 ++----------------------------------- 1 file changed, 2 insertions(+), 38 deletions(-) diff --git a/src/afs/OBSD/osi_vnodeops.c b/src/afs/OBSD/osi_vnodeops.c index 880fe4532..a20c0316e 100644 --- a/src/afs/OBSD/osi_vnodeops.c +++ b/src/afs/OBSD/osi_vnodeops.c @@ -144,8 +144,6 @@ int afs_nbsd_readdir(void *); int afs_nbsd_readlink(void *); int afs_nbsd_inactive(void *); int afs_nbsd_reclaim(void *); -int afs_nbsd_lock(void *); -int afs_nbsd_unlock(void *); int afs_nbsd_bmap(void *); int afs_nbsd_strategy(void *); int afs_nbsd_print(void *); @@ -189,8 +187,8 @@ struct vnodeopv_entry_desc afs_vnodeop_entries[] = { {&vop_abortop_desc, vop_generic_abortop}, /* abortop */ {&vop_inactive_desc, afs_nbsd_inactive}, /* inactive */ {&vop_reclaim_desc, afs_nbsd_reclaim}, /* reclaim */ - {&vop_lock_desc, afs_nbsd_lock}, /* lock */ - {&vop_unlock_desc, afs_nbsd_unlock}, /* unlock */ + {&vop_lock_desc, ((int (*)(void *))vop_generic_lock)}, /* lock */ + {&vop_unlock_desc, ((int (*)(void *))vop_generic_unlock)}, /* unlock */ {&vop_bmap_desc, afs_nbsd_bmap}, /* bmap */ {&vop_strategy_desc, afs_nbsd_strategy}, /* strategy */ {&vop_print_desc, afs_nbsd_print}, /* print */ @@ -920,40 +918,6 @@ afs_nbsd_reclaim(void *v) #endif } -int -afs_nbsd_lock(void *v) -{ - struct vop_lock_args /* { - * struct vnode *a_vp; - * int a_flags; - * sturct proc *a_p; - * } */ *ap = v; - struct vnode *vp = ap->a_vp; - struct vcache *vc = VTOAFS(vp); - - if (!vc) - panic("afs_nbsd_lock: null vcache"); - return afs_osi_lockmgr(&vc->rwlock, ap->a_flags | LK_CANRECURSE, &vp->v_interlock, - ap->a_p); -} - -int -afs_nbsd_unlock(void *v) -{ - struct vop_unlock_args /* { - * struct vnode *a_vp; - * int a_flags; - * struct proc *a_p; - * } */ *ap = v; - struct vnode *vp = ap->a_vp; - struct vcache *vc = VTOAFS(vp); - - if (!vc) - panic("afs_nbsd_unlock: null vcache"); - return afs_osi_lockmgr(&vc->rwlock, ap->a_flags | LK_RELEASE, &vp->v_interlock, - ap->a_p); -} - int afs_nbsd_bmap(void *v) { -- 2.39.5