Date: Mon, 3 Feb 2003 19:48:57 -0800 (PST) From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 24632 for review Message-ID: <200302040348.h143mvCI002506@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=24632 Change 24632 by rwatson@rwatson_tislabs on 2003/02/03 19:48:33 Move stub mtx_{un,}lock() macros into !_KERNEL for global.h (oops). Have SIDTAB_TRYLOCK() return 1 indicating always success on locking in userland. Merged from trustedbsd_sebsd branch. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/global.h#6 edit .. //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/sidtab.c#9 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/global.h#6 (text+ko) ==== @@ -27,13 +27,13 @@ MALLOC_DECLARE(M_SEBSD_SS); #define sebsd_malloc(a,b,c) malloc(a,b,c) #define sebsd_free(a,b) free(a,b) -#define mtx_lock(a) -#define mtx_unlock(a) #else /* _KERNEL */ #include <stdlib.h> #include <errno.h> #define sebsd_malloc(a,b,c) (c&M_ZERO)?calloc(1,a):malloc(a) #define sebsd_free(a,b) free(a) +#define mtx_lock(a) +#define mtx_unlock(a) #endif /* _KERNEL */ extern int ss_initialized; ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/ss/sidtab.c#9 (text+ko) ==== @@ -35,7 +35,7 @@ #define SIDTAB_UNLOCK(s) mtx_unlock(&(s)->sidtab_mtx) #else #define INIT_SIDTAB_LOCK(s) -#define SIDTAB_TRYLOCK(s) 0 +#define SIDTAB_TRYLOCK(s) 1 #define SIDTAB_LOCK(s) 0 #define SIDTAB_UNLOCK(s) #endif To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200302040348.h143mvCI002506>