From owner-svn-src-head@FreeBSD.ORG  Mon Mar  4 02:21:35 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 15365F4B;
 Mon,  4 Mar 2013 02:21:35 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 091593D8;
 Mon,  4 Mar 2013 02:21:35 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r242LYiw085228;
 Mon, 4 Mar 2013 02:21:34 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r242LYAH085225;
 Mon, 4 Mar 2013 02:21:34 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201303040221.r242LYAH085225@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Mon, 4 Mar 2013 02:21:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r247764 - in head/sys/compat: linprocfs linux
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Mar 2013 02:21:35 -0000

Author: eadler
Date: Mon Mar  4 02:21:34 2013
New Revision: 247764
URL: http://svnweb.freebsd.org/changeset/base/247764

Log:
  Remove check for NULL prior to free(9) and m_freem(9).
  
  Approved by:	cperciva (mentor)

Modified:
  head/sys/compat/linprocfs/linprocfs.c
  head/sys/compat/linux/linux_file.c
  head/sys/compat/linux/linux_socket.c

Modified: head/sys/compat/linprocfs/linprocfs.c
==============================================================================
--- head/sys/compat/linprocfs/linprocfs.c	Mon Mar  4 02:21:31 2013	(r247763)
+++ head/sys/compat/linprocfs/linprocfs.c	Mon Mar  4 02:21:34 2013	(r247764)
@@ -386,8 +386,7 @@ linprocfs_domtab(PFS_FILL_ARGS)
 		sbuf_printf(sb, " 0 0\n");
 	}
 	mtx_unlock(&mountlist_mtx);
-	if (flep != NULL)
-		free(flep, M_TEMP);
+	free(flep, M_TEMP);
 	return (error);
 }
 
@@ -447,8 +446,7 @@ linprocfs_dopartitions(PFS_FILL_ARGS)
 	}
 	g_topology_unlock();
 
-	if (flep != NULL)
-		free(flep, M_TEMP);
+	free(flep, M_TEMP);
 	return (error);
 }
 

Modified: head/sys/compat/linux/linux_file.c
==============================================================================
--- head/sys/compat/linux/linux_file.c	Mon Mar  4 02:21:31 2013	(r247763)
+++ head/sys/compat/linux/linux_file.c	Mon Mar  4 02:21:34 2013	(r247764)
@@ -517,8 +517,7 @@ eof:
 	td->td_retval[0] = nbytes - resid;
 
 out:
-	if (cookies)
-		free(cookies, M_TEMP);
+	free(cookies, M_TEMP);
 
 	VOP_UNLOCK(vp, 0);
 	foffset_unlock(fp, off, 0);

Modified: head/sys/compat/linux/linux_socket.c
==============================================================================
--- head/sys/compat/linux/linux_socket.c	Mon Mar  4 02:21:31 2013	(r247763)
+++ head/sys/compat/linux/linux_socket.c	Mon Mar  4 02:21:34 2013	(r247764)
@@ -1443,10 +1443,8 @@ out:
 
 bad:
 	free(iov, M_IOV);
-	if (control != NULL)
-		m_freem(control);
-	if (linux_cmsg != NULL)
-		free(linux_cmsg, M_TEMP);
+	m_freem(control);
+	free(linux_cmsg, M_TEMP);
 
 	return (error);
 }