From 4014b558307253555f43f360be60f49ea39b7ceb Mon Sep 17 00:00:00 2001 From: attilio Date: Mon, 25 Feb 2008 18:45:57 +0000 Subject: Axe the 'thread' argument from VOP_ISLOCKED() and lockstatus() as it is always curthread. As KPI gets broken by this patch, manpages and __FreeBSD_version will be updated by further commits. Tested by: Andrea Barberio --- sys/fs/unionfs/union_vnops.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sys/fs/unionfs/union_vnops.c') diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c index b898083..d009150 100644 --- a/sys/fs/unionfs/union_vnops.c +++ b/sys/fs/unionfs/union_vnops.c @@ -278,7 +278,7 @@ unionfs_lookup(struct vop_cachedlookup_args *ap) if (LK_SHARED == (cnp->cn_lkflags & LK_TYPE_MASK)) VOP_UNLOCK(vp, 0); - if (LK_EXCLUSIVE != VOP_ISLOCKED(vp, td)) { + if (LK_EXCLUSIVE != VOP_ISLOCKED(vp)) { vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); lockflag = 1; } @@ -528,7 +528,7 @@ unionfs_close(struct vop_close_args *ap) cred = ap->a_cred; td = ap->a_td; - if (VOP_ISLOCKED(ap->a_vp, td) != LK_EXCLUSIVE) { + if (VOP_ISLOCKED(ap->a_vp) != LK_EXCLUSIVE) { vn_lock(ap->a_vp, LK_EXCLUSIVE | LK_RETRY); locked = 1; } @@ -1416,7 +1416,7 @@ unionfs_readdir(struct vop_readdir_args *ap) } /* check the open count. unionfs needs to open before readdir. */ - if (VOP_ISLOCKED(ap->a_vp, td) != LK_EXCLUSIVE) { + if (VOP_ISLOCKED(ap->a_vp) != LK_EXCLUSIVE) { vn_lock(ap->a_vp, LK_UPGRADE | LK_RETRY); locked = 1; } -- cgit v1.1