From 7213f4c32b94b60add6400f4213c1ca347bd609f Mon Sep 17 00:00:00 2001 From: attilio Date: Thu, 24 Jan 2008 12:34:30 +0000 Subject: Cleanup lockmgr interface and exported KPI: - Remove the "thread" argument from the lockmgr() function as it is always curthread now - Axe lockcount() function as it is no longer used - Axe LOCKMGR_ASSERT() as it is bogus really and no currently used. Hopefully this will be soonly replaced by something suitable for it. - Remove the prototype for dumplockinfo() as the function is no longer present Addictionally: - Introduce a KASSERT() in lockstatus() in order to let it accept only curthread or NULL as they should only be passed - Do a little bit of style(9) cleanup on lockmgr.h KPI results heavilly broken by this change, so manpages and FreeBSD_version will be modified accordingly by further commits. Tested by: matteo --- sys/fs/smbfs/smbfs_node.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'sys/fs/smbfs') diff --git a/sys/fs/smbfs/smbfs_node.c b/sys/fs/smbfs/smbfs_node.c index 20ac89d..d2993c6 100644 --- a/sys/fs/smbfs/smbfs_node.c +++ b/sys/fs/smbfs/smbfs_node.c @@ -58,8 +58,10 @@ #include #define SMBFS_NOHASH(smp, hval) (&(smp)->sm_hash[(hval) & (smp)->sm_hashlen]) -#define smbfs_hash_lock(smp, td) lockmgr(&smp->sm_hashlock, LK_EXCLUSIVE, NULL, td) -#define smbfs_hash_unlock(smp, td) lockmgr(&smp->sm_hashlock, LK_RELEASE, NULL, td) +#define smbfs_hash_lock(smp, td) \ + lockmgr(&smp->sm_hashlock, LK_EXCLUSIVE, NULL) +#define smbfs_hash_unlock(smp, td) \ + lockmgr(&smp->sm_hashlock, LK_RELEASE, NULL) extern struct vop_vector smbfs_vnodeops; /* XXX -> .h file */ @@ -308,7 +310,6 @@ smbfs_reclaim(ap) } */ *ap; { struct vnode *vp = ap->a_vp; - struct thread *td = ap->a_td; struct vnode *dvp; struct smbnode *np = VTOSMB(vp); struct smbmount *smp = VTOSMBFS(vp); -- cgit v1.1