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/nfs4client/nfs4_idmap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sys/nfs4client') diff --git a/sys/nfs4client/nfs4_idmap.c b/sys/nfs4client/nfs4_idmap.c index 7eae5ec..065bef2 100644 --- a/sys/nfs4client/nfs4_idmap.c +++ b/sys/nfs4client/nfs4_idmap.c @@ -74,9 +74,9 @@ struct idmap_hash { struct lock hash_lock; }; -#define IDMAP_RLOCK(lock) lockmgr(lock, LK_SHARED, NULL, curthread) -#define IDMAP_WLOCK(lock) lockmgr(lock, LK_EXCLUSIVE, NULL, curthread) -#define IDMAP_UNLOCK(lock) lockmgr(lock, LK_RELEASE, NULL, curthread) +#define IDMAP_RLOCK(lock) lockmgr(lock, LK_SHARED, NULL) +#define IDMAP_WLOCK(lock) lockmgr(lock, LK_EXCLUSIVE, NULL) +#define IDMAP_UNLOCK(lock) lockmgr(lock, LK_RELEASE, NULL) static struct idmap_hash idmap_uid_hash; -- cgit v1.1