From owner-svn-src-head@FreeBSD.ORG  Fri Jun 28 18:32:47 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 6329C54C;
 Fri, 28 Jun 2013 18:32:47 +0000 (UTC) (envelope-from mjg@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 5628F1E1F;
 Fri, 28 Jun 2013 18:32:47 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5SIWlan052381;
 Fri, 28 Jun 2013 18:32:47 GMT (envelope-from mjg@svn.freebsd.org)
Received: (from mjg@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5SIWllO052380;
 Fri, 28 Jun 2013 18:32:47 GMT (envelope-from mjg@svn.freebsd.org)
Message-Id: <201306281832.r5SIWllO052380@svn.freebsd.org>
From: Mateusz Guzik <mjg@FreeBSD.org>
Date: Fri, 28 Jun 2013 18:32:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r252351 - head/sys/kern
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: Fri, 28 Jun 2013 18:32:47 -0000

Author: mjg
Date: Fri Jun 28 18:32:46 2013
New Revision: 252351
URL: http://svnweb.freebsd.org/changeset/base/252351

Log:
  Remove duplicate NULL check in kern_proc_filedesc_out.
  No functional changes.
  
  MFC after:	1 week

Modified:
  head/sys/kern/kern_descrip.c

Modified: head/sys/kern/kern_descrip.c
==============================================================================
--- head/sys/kern/kern_descrip.c	Fri Jun 28 18:25:04 2013	(r252350)
+++ head/sys/kern/kern_descrip.c	Fri Jun 28 18:32:46 2013	(r252351)
@@ -3446,9 +3446,8 @@ kern_proc_filedesc_out(struct proc *p,  
 			break;
 	}
 	FILEDESC_SUNLOCK(fdp);
+	fddrop(fdp);
 fail:
-	if (fdp != NULL)
-		fddrop(fdp);
 	free(efbuf, M_TEMP);
 	return (error);
 }