PERFORCE change 71686 for review

[Sam Leffler]

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

Change 71686 by sam at sam_ebb on 2005/02/23 21:36:40

	IFC

Affected files ...

.. //depot/projects/wifi/sys/dev/advansys/adwlib.c#3 integrate
.. //depot/projects/wifi/sys/dev/ciss/ciss.c#3 integrate
.. //depot/projects/wifi/sys/dev/tdfx/tdfx_pci.c#2 integrate
.. //depot/projects/wifi/sys/fs/unionfs/union_vfsops.c#5 integrate
.. //depot/projects/wifi/sys/kern/subr_bus.c#8 integrate
.. //depot/projects/wifi/sys/kern/subr_eventhandler.c#3 integrate
.. //depot/projects/wifi/sys/kern/uipc_mbuf.c#7 integrate

Differences ...

==== //depot/projects/wifi/sys/dev/advansys/adwlib.c#3 (text+ko) ====

@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/advansys/adwlib.c,v 1.10 2005/01/06 01:42:24 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/advansys/adwlib.c,v 1.11 2005/02/21 00:32:03 scottl Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -374,7 +374,7 @@
 		major_ver = (biosmem[addr + 1] >> 4) & 0xF;
 		if ((adw->chip == ADW_CHIP_ASC3550)
 		 && (major_ver <= 3
-		  || (major_ver == 3 && minor_ver == 1))) {
+		  || (major_ver == 3 && minor_ver <= 1))) {
 			/*
 			 * BIOS 3.1 and earlier location of
 			 * 'wdtr_able' variable.

==== //depot/projects/wifi/sys/dev/ciss/ciss.c#3 (text+ko) ====

@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$FreeBSD: src/sys/dev/ciss/ciss.c,v 1.57 2005/01/20 22:51:38 ps Exp $
+ *	$FreeBSD: src/sys/dev/ciss/ciss.c,v 1.58 2005/02/21 05:17:29 scottl Exp $
  */
 
 /*
@@ -2167,8 +2167,6 @@
     if (error) {
 	if (cr != NULL)
 	    ciss_release_request(cr);
-	if ((bufp != NULL) && (*bufp == NULL) && (buf != NULL))
-	    free(buf, CISS_MALLOC_CLASS);
     } else {
 	*crp = cr;
 	if ((bufp != NULL) && (*bufp == NULL) && (buf != NULL))
@@ -3545,7 +3543,8 @@
 	     * Mark the device offline so that it'll start producing selection
 	     * timeouts to the upper layer.
 	     */
-	    sc->ciss_physical[bus][target].cp_online = 0;
+	    if ((bus >= 0) && (target >= 0))
+		sc->ciss_physical[bus][target].cp_online = 0;
 	} else {
 	    /*
 	     * Rescan the physical lun list for new items

==== //depot/projects/wifi/sys/dev/tdfx/tdfx_pci.c#2 (text+ko) ====

@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/tdfx/tdfx_pci.c,v 1.35 2004/06/16 09:46:59 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/tdfx/tdfx_pci.c,v 1.36 2005/02/22 18:57:18 sam Exp $");
 
 /* 3dfx driver for FreeBSD 4.x - Finished 11 May 2000, 12:25AM ET
  *
@@ -384,12 +384,8 @@
 		 * If, for some reason, we can't set the MTRR (N/A?) we may still continue
 		 */
 #ifdef DEBUG
-		if(retval == 0) {
-			device_printf(dev, "MTRR Set Type Uncacheable %x\n",
-			    (u_int32_t)tdfx_info->mrdesc.mr_base);
-		} else {
-			device_printf(dev, "Couldn't Set MTRR\n");
-		}
+		device_printf(dev, "MTRR Set Type Uncacheable %x\n",
+		    (u_int32_t)tdfx_info->mrdesc.mr_base);
 #endif
 	}
 #ifdef DEBUG

==== //depot/projects/wifi/sys/fs/unionfs/union_vfsops.c#5 (text+ko) ====

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)union_vfsops.c	8.20 (Berkeley) 5/20/95
- * $FreeBSD: src/sys/fs/unionfs/union_vfsops.c,v 1.73 2005/01/06 18:10:42 imp Exp $
+ * $FreeBSD: src/sys/fs/unionfs/union_vfsops.c,v 1.74 2005/02/22 19:02:24 sam Exp $
  */
 
 /*
@@ -73,7 +73,6 @@
 	struct vnode *upperrootvp = NULLVP;
 	struct union_mount *um = 0;
 	struct vattr va;
-	struct ucred *cred = 0;
 	char *cp = 0, *target;
 	int op;
 	int len;
@@ -312,8 +311,6 @@
 		/* XXX other fields */
 		free(um, M_UNIONFSMNT);
 	}
-	if (cred)
-		crfree(cred);
 	if (upperrootvp)
 		vrele(upperrootvp);
 	if (lowerrootvp)

==== //depot/projects/wifi/sys/kern/subr_bus.c#8 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/subr_bus.c,v 1.171 2005/02/08 18:03:17 njl Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/subr_bus.c,v 1.172 2005/02/23 00:43:00 sam Exp $");
 
 #include "opt_bus.h"
 
@@ -200,10 +200,7 @@
 {
 	devclass_t dc = (devclass_t)arg1;
 	const char *value;
-	char *buf;
-	int error;
 
-	buf = NULL;
 	switch (arg2) {
 	case DEVCLASS_SYSCTL_PARENT:
 		value = dc->parent ? dc->parent->name : "";
@@ -211,10 +208,7 @@
 	default:
 		return (EINVAL);
 	}
-	error = SYSCTL_OUT(req, value, strlen(value));
-	if (buf != NULL)
-		free(buf, M_BUS);
-	return (error);
+	return (SYSCTL_OUT(req, value, strlen(value)));
 }
 
 static void

==== //depot/projects/wifi/sys/kern/subr_eventhandler.c#3 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/subr_eventhandler.c,v 1.22 2004/12/06 10:53:40 jkoshy Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/subr_eventhandler.c,v 1.23 2005/02/23 19:32:29 sam Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -166,7 +166,6 @@
 	if (list->el_runcount == 0) {
 	    CTR2(KTR_EVH, "%s: removing all items from \"%s\"", __func__,
 		list->el_name);
-	    TAILQ_REMOVE(&list->el_entries, ep, ee_link);
 	    while (!TAILQ_EMPTY(&list->el_entries)) {
 		ep = TAILQ_FIRST(&list->el_entries);
 		TAILQ_REMOVE(&list->el_entries, ep, ee_link);

==== //depot/projects/wifi/sys/kern/uipc_mbuf.c#7 (text+ko) ====

@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/uipc_mbuf.c,v 1.141 2005/02/10 22:23:02 bmilekic Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/uipc_mbuf.c,v 1.142 2005/02/23 19:34:44 sam Exp $");
 
 #include "opt_mac.h"
 #include "opt_param.h"
@@ -1194,8 +1194,6 @@
 #ifdef MBUF_STRESS_TEST
 	m_defragfailure++;
 #endif
-	if (m_new)
-		m_free(m_new);
 	if (m_final)
 		m_freem(m_final);
 	return (NULL);
@@ -1275,8 +1273,6 @@
 	m0 = m_final;
 	return (m0);
 nospace:
-	if (m_new)
-		m_free(m_new);
 	if (m_final)
 		m_freem(m_final);
 	/* Return the original chain on failure */