PERFORCE change 140547 for review

[Vincenzo Iozzo]

http://perforce.freebsd.org/chv.cgi?CH=140547

Change 140547 by snagg at snagg_macosx on 2008/04/24 20:50:10


Affected files ...

.. //depot/projects/soc2008/snagg-audit/sys/kern/vfs_subr.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/net/radix_mpath.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/security/audit/audit.h#2 integrate

Differences ...

==== //depot/projects/soc2008/snagg-audit/sys/kern/vfs_subr.c#2 (text+ko) ====

@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/vfs_subr.c,v 1.728 2008/04/16 11:33:31 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/vfs_subr.c,v 1.729 2008/04/24 09:58:33 kib Exp $");
 
 #include "opt_ddb.h"
 #include "opt_mac.h"
@@ -311,9 +311,9 @@
 	TAILQ_INIT(&vnode_free_list);
 	mtx_init(&vnode_free_list_mtx, "vnode_free_list", NULL, MTX_DEF);
 	vnode_zone = uma_zcreate("VNODE", sizeof (struct vnode), NULL, NULL,
-	    NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE);
+	    NULL, NULL, UMA_ALIGN_PTR, 0);
 	vnodepoll_zone = uma_zcreate("VNODEPOLL", sizeof (struct vpollinfo),
-	    NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE);
+	    NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0);
 	/*
 	 * Initialize the filesystem syncer.
 	 */

==== //depot/projects/soc2008/snagg-audit/sys/net/radix_mpath.c#2 (text+ko) ====

@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/net/radix_mpath.c,v 1.3 2008/04/13 23:04:46 qingli Exp $");
+__FBSDID("$FreeBSD: src/sys/net/radix_mpath.c,v 1.4 2008/04/24 05:04:52 qingli Exp $");
 
 #include "opt_inet6.h"
 
@@ -269,7 +269,9 @@
 	ro->ro_rt = rtalloc1(&ro->ro_dst, 1, 0UL);
 
 	/* if the route does not exist or it is not multipath, don't care */
-	if (!ro->ro_rt || !rn_mpath_next((struct radix_node *)ro->ro_rt)) {
+	if (ro->ro_rt == NULL)
+		return;
+	if (rn_mpath_next((struct radix_node *)ro->ro_rt) == NULL) {
 		RT_UNLOCK(ro->ro_rt);
 		return;
 	}

==== //depot/projects/soc2008/snagg-audit/sys/security/audit/audit.h#2 (text) ====

@@ -26,7 +26,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/security/audit/audit.h,v 1.15 2007/10/26 01:23:07 csjp Exp $
+ * $FreeBSD: src/sys/security/audit/audit.h,v 1.16 2008/04/24 12:23:31 rwatson Exp $
  */
 
 /*
@@ -202,7 +202,7 @@
  * possible that an audit record was begun before auditing was turned off.
  */
 #define	AUDIT_SYSCALL_EXIT(error, td)	do {				\
-	if (audit_enabled | (td->td_ar != NULL))			\
+	if (audit_enabled || (td->td_ar != NULL))			\
 		audit_syscall_exit(error, td);				\
 } while (0)