Date: Thu, 12 Mar 2009 20:20:16 GMT From: Stacey Son <sson@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 159130 for review Message-ID: <200903122020.n2CKKGBa050532@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=159130 Change 159130 by sson@sson_amd64 on 2009/03/12 20:19:42 Various fixes in audit_fcntl.h and bsm_fcntl.c: - Add missing F_GETXFL in audit_fcntl.h. - BSM_F_SETLK_NBMAND should be defined as 42 and BSM_F_SETLK64_NBMAND should be 44. - Note that BSM_F_DUF2FD is both FreeBSD and Solaris specific. - Add file system specific fcntl commands for darwin. - Many comment fixes. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_fcntl.c#2 edit .. //depot/projects/trustedbsd/openbsm/sys/bsm/audit_fcntl.h#2 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_fcntl.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_fcntl.c#1 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_fcntl.c#2 $ */ #include <sys/param.h> @@ -121,14 +121,17 @@ #ifdef F_UNSHARE { BSM_F_UNSHARE, F_UNSHARE }, #endif -#ifdef F_SETLK64_NBMAND - { BSM_F_SETLK64_NBMAND, F_SETLK64_NBMAND }, +#ifdef F_SETLK_NBMAND + { BSM_F_SETLK_NBMAND, F_SETLK_NBMAND }, #endif #ifdef F_SHARE_NBMAND { BSM_F_SHARE_NBMAND, F_SHARE_NBMAND }, #endif -#ifdef F_SETLK_NBMAND - { BSM_F_SETLK_NBMAND, F_SETLK_NBMAND }, +#ifdef F_SETLK64_NBMAND + { BSM_F_SETLK64_NBMAND, F_SETLK64_NBMAND }, +#endif +#ifdef F_GETXFL + { BSM_F_GETXFL, F_GETXFL }, #endif #ifdef F_BADFD { BSM_F_BADFD, F_BADFD }, @@ -146,6 +149,13 @@ { BSM_F_SETLK_REMOTE, F_SETLK_REMOTE }, #endif +#ifdef F_SETSIG + { BSM_F_SETSIG, F_SETSIG }, +#endif +#ifdef F_GETSIG + { BSM_F_GETSIG, F_GETSIG }, +#endif + #ifdef F_CHKCLEAN { BSM_F_CHKCLEAN, F_CHKCLEAN }, #endif @@ -207,12 +217,24 @@ { BSM_F_MARKDEPENDENCY, F_MARKDEPENDENCY }, #endif -#ifdef F_SETSIG - { BSM_F_SETSIG, F_SETSIG }, -#endif -#ifdef F_GETSIG - { BSM_F_GETSIG, F_GETSIG }, -#endif +#ifdef FCNTL_FS_SPECIFIC_BASE + { BSM_F_FS_SPECIFIC_0, FCNTL_FS_SPECIFIC_BASE}, + { BSM_F_FS_SPECIFIC_1, FCNTL_FS_SPECIFIC_BASE + 1}, + { BSM_F_FS_SPECIFIC_2, FCNTL_FS_SPECIFIC_BASE + 2}, + { BSM_F_FS_SPECIFIC_3, FCNTL_FS_SPECIFIC_BASE + 3}, + { BSM_F_FS_SPECIFIC_4, FCNTL_FS_SPECIFIC_BASE + 4}, + { BSM_F_FS_SPECIFIC_5, FCNTL_FS_SPECIFIC_BASE + 5}, + { BSM_F_FS_SPECIFIC_6, FCNTL_FS_SPECIFIC_BASE + 6}, + { BSM_F_FS_SPECIFIC_7, FCNTL_FS_SPECIFIC_BASE + 7}, + { BSM_F_FS_SPECIFIC_8, FCNTL_FS_SPECIFIC_BASE + 8}, + { BSM_F_FS_SPECIFIC_9, FCNTL_FS_SPECIFIC_BASE + 9}, + { BSM_F_FS_SPECIFIC_10, FCNTL_FS_SPECIFIC_BASE + 10}, + { BSM_F_FS_SPECIFIC_11, FCNTL_FS_SPECIFIC_BASE + 11}, + { BSM_F_FS_SPECIFIC_12, FCNTL_FS_SPECIFIC_BASE + 12}, + { BSM_F_FS_SPECIFIC_13, FCNTL_FS_SPECIFIC_BASE + 13}, + { BSM_F_FS_SPECIFIC_14, FCNTL_FS_SPECIFIC_BASE + 14}, + { BSM_F_FS_SPECIFIC_15, FCNTL_FS_SPECIFIC_BASE + 15}, +#endif /* FCNTL_FS_SPECIFIC_BASE */ }; static const int bsm_fcntl_cmd_count = sizeof(bsm_fcntl_cmdtab) / sizeof(bsm_fcntl_cmdtab[0]); ==== //depot/projects/trustedbsd/openbsm/sys/bsm/audit_fcntl.h#2 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_fcntl.h#1 $ + * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_fcntl.h#2 $ */ #ifndef _BSM_AUDIT_FCNTL_H_ @@ -43,77 +43,98 @@ #define BSM_F_O_GETLK 5 /* Solaris-specific. */ #define BSM_F_SETLK 6 #define BSM_F_SETLKW 7 -#define BSM_F_CHKFL 8 /* Solaris-specific */ -#define BSM_F_DUP2FD 9 /* Solaris-specific */ -#define BSM_F_ALLOCSP 10 /* Solaris-specific */ -#define BSM_F_FREESP 11 /* Solaris-specific */ +#define BSM_F_CHKFL 8 /* Solaris-specific. */ +#define BSM_F_DUP2FD 9 /* FreeBSD/Solaris-specific. */ +#define BSM_F_ALLOCSP 10 /* Solaris-specific. */ +#define BSM_F_FREESP 11 /* Solaris-specific. */ -#define BSM_F_ISSTREAM 13 /* Solaris-specific */ +#define BSM_F_ISSTREAM 13 /* Solaris-specific. */ #define BSM_F_GETLK 14 -#define BSM_F_PRIV 15 /* Solaris-specific */ -#define BSM_F_NPRIV 16 /* Solaris-specific */ -#define BSM_F_QUOTACTL 17 /* Solaris-specific */ -#define BSM_F_BLOCKS 18 /* Solaris-specific */ -#define BSM_F_BLKSIZE 19 /* Solaris-specific */ +#define BSM_F_PRIV 15 /* Solaris-specific. */ +#define BSM_F_NPRIV 16 /* Solaris-specific. */ +#define BSM_F_QUOTACTL 17 /* Solaris-specific. */ +#define BSM_F_BLOCKS 18 /* Solaris-specific. */ +#define BSM_F_BLKSIZE 19 /* Solaris-specific. */ #define BSM_F_GETOWN 23 #define BSM_F_SETOWN 24 -#define BSM_F_REVOKE 25 /* Solaris-specific */ -#define BSM_F_HASREMOTELOCKS 26 /* Solaris-specific */ -#define BSM_F_FREESP64 27 /* Solaris-specific */ -#define BSM_F_ALLOCSP64 28 /* Solaris-specific */ +#define BSM_F_REVOKE 25 /* Solaris-specific. */ +#define BSM_F_HASREMOTELOCKS 26 /* Solaris-specific. */ +#define BSM_F_FREESP64 27 /* Solaris-specific. */ +#define BSM_F_ALLOCSP64 28 /* Solaris-specific. */ -#define BSM_F_GETLK64 33 /* Solaris-specific */ -#define BSM_F_SETLK64 34 /* Solaris-specific */ -#define BSM_F_SETLKW64 35 /* Solaris-specific */ +#define BSM_F_GETLK64 33 /* Solaris-specific. */ +#define BSM_F_SETLK64 34 /* Solaris-specific. */ +#define BSM_F_SETLKW64 35 /* Solaris-specific. */ -#define BSM_F_SHARE 40 /* Solaris-specific */ -#define BSM_F_UNSHARE 41 /* Solaris-specific */ -#define BSM_F_SETLK64_NBMAND 42 /* Solaris-specific */ -#define BSM_F_SHARE_NBMAND 43 /* Solaris-specific */ -#define BSM_F_SETLK_NBMAND 44 /* Solaris-specific */ - -#define BSM_F_BADFD 46 /* Solaris-specific */ +#define BSM_F_SHARE 40 /* Solaris-specific. */ +#define BSM_F_UNSHARE 41 /* Solaris-specific. */ +#define BSM_F_SETLK_NBMAND 42 /* Solaris-specific. */ +#define BSM_F_SHARE_NBMAND 43 /* Solaris-specific. */ +#define BSM_F_SETLK64_NBMAND 44 /* Solaris-specific. */ +#define BSM_F_GETXFL 45 /* Solaris-specific. */ +#define BSM_F_BADFD 46 /* Solaris-specific. */ /* * FreeBSD-specific (100-199). */ -#define BSM_F_OGETLK 107 /* FreeBSD-specific */ -#define BSM_F_OSETLK 108 /* FreeBSD-specific */ -#define BSM_F_OSETLKW 109 /* FreeBSD-specific */ +#define BSM_F_OGETLK 107 /* FreeBSD-specific. */ +#define BSM_F_OSETLK 108 /* FreeBSD-specific. */ +#define BSM_F_OSETLKW 109 /* FreeBSD-specific. */ + +#define BSM_F_SETLK_REMOTE 114 /* FreeBSD-specific. */ -#define BSM_F_SETLK_REMOTE 114 /* FreeBSD-specific */ +/* + * Linux-specific (200-299). + */ +#define BSM_F_SETSIG 210 /* Linux-specific. */ +#define BSM_F_GETSIG 211 /* Linux-specific. */ /* - * Darwin-specific (200-299). + * Darwin-specific (300-399). */ -#define BSM_F_CHKCLEAN 241 /* Darwin-specific */ -#define BSM_F_PREALLOCATE 242 /* Darwin-specific */ -#define BSM_F_SETSIZE 243 /* Darwin-specific */ -#define BSM_F_RDADVISE 244 /* Darwin-specific */ -#define BSM_F_RDAHEAD 245 /* Darwin-specific */ -#define BSM_F_READBOOTSTRAP 246 /* Darwin-specific */ -#define BSM_F_WRITEBOOTSTRAP 247 /* Darwin-specific */ -#define BSM_F_NOCACHE 248 /* Darwin-specific */ -#define BSM_F_LOG2PHYS 249 /* Darwin-specific */ -#define BSM_F_GETPATH 250 /* Darwin-specific */ -#define BSM_F_FULLFSYNC 251 /* Darwin-specific */ -#define BSM_F_PATHPKG_CHECK 252 /* Darwin-specific */ -#define BSM_F_FREEZE_FS 253 /* Darwin-specific */ -#define BSM_F_THAW_FS 254 /* Darwin-specific */ -#define BSM_F_GLOBAL_NOCACHE 255 /* Darwin-specific */ -#define BSM_F_OPENFROM 256 /* Darwin-specific */ -#define BSM_F_UNLINKFROM 257 /* Darwin-specific */ -#define BSM_F_CHECK_OPENEVT 258 /* Darwin-specific */ -#define BSM_F_ADDSIGS 259 /* Darwin-specific */ -#define BSM_F_MARKDEPENDENCY 260 /* Darwin-specific */ +#define BSM_F_CHKCLEAN 341 /* Darwin-specific. */ +#define BSM_F_PREALLOCATE 342 /* Darwin-specific. */ +#define BSM_F_SETSIZE 343 /* Darwin-specific. */ +#define BSM_F_RDADVISE 344 /* Darwin-specific. */ +#define BSM_F_RDAHEAD 345 /* Darwin-specific. */ +#define BSM_F_READBOOTSTRAP 346 /* Darwin-specific. */ +#define BSM_F_WRITEBOOTSTRAP 347 /* Darwin-specific. */ +#define BSM_F_NOCACHE 348 /* Darwin-specific. */ +#define BSM_F_LOG2PHYS 349 /* Darwin-specific. */ +#define BSM_F_GETPATH 350 /* Darwin-specific. */ +#define BSM_F_FULLFSYNC 351 /* Darwin-specific. */ +#define BSM_F_PATHPKG_CHECK 352 /* Darwin-specific. */ +#define BSM_F_FREEZE_FS 353 /* Darwin-specific. */ +#define BSM_F_THAW_FS 354 /* Darwin-specific. */ +#define BSM_F_GLOBAL_NOCACHE 355 /* Darwin-specific. */ +#define BSM_F_OPENFROM 356 /* Darwin-specific. */ +#define BSM_F_UNLINKFROM 357 /* Darwin-specific. */ +#define BSM_F_CHECK_OPENEVT 358 /* Darwin-specific. */ +#define BSM_F_ADDSIGS 359 /* Darwin-specific. */ +#define BSM_F_MARKDEPENDENCY 360 /* Darwin-specific. */ /* - * Linux-specific (300-399). + * Darwin file system specific (400-499). */ -#define BSM_F_SETSIG 310 /* Linux-specific */ -#define BSM_F_GETSIG 311 /* Linux-specific */ +#define BSM_F_FS_SPECIFIC_0 400 /* Darwin-fs-specific. */ +#define BSM_F_FS_SPECIFIC_1 401 /* Darwin-fs-specific. */ +#define BSM_F_FS_SPECIFIC_2 402 /* Darwin-fs-specific. */ +#define BSM_F_FS_SPECIFIC_3 403 /* Darwin-fs-specific. */ +#define BSM_F_FS_SPECIFIC_4 404 /* Darwin-fs-specific. */ +#define BSM_F_FS_SPECIFIC_5 405 /* Darwin-fs-specific. */ +#define BSM_F_FS_SPECIFIC_6 406 /* Darwin-fs-specific. */ +#define BSM_F_FS_SPECIFIC_7 407 /* Darwin-fs-specific. */ +#define BSM_F_FS_SPECIFIC_8 408 /* Darwin-fs-specific. */ +#define BSM_F_FS_SPECIFIC_9 409 /* Darwin-fs-specific. */ +#define BSM_F_FS_SPECIFIC_10 410 /* Darwin-fs-specific. */ +#define BSM_F_FS_SPECIFIC_11 411 /* Darwin-fs-specific. */ +#define BSM_F_FS_SPECIFIC_12 412 /* Darwin-fs-specific. */ +#define BSM_F_FS_SPECIFIC_13 413 /* Darwin-fs-specific. */ +#define BSM_F_FS_SPECIFIC_14 414 /* Darwin-fs-specific. */ +#define BSM_F_FS_SPECIFIC_15 415 /* Darwin-fs-specific. */ + -#define BSM_F_UNKNOWN 500 +#define BSM_F_UNKNOWN 0xFFFF #endif /* !_BSM_AUDIT_FCNTL_H_ */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200903122020.n2CKKGBa050532>