From owner-svn-src-all@FreeBSD.ORG  Sun Jun 10 06:31:54 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id DA94B1065676;
	Sun, 10 Jun 2012 06:31:54 +0000 (UTC) (envelope-from pjd@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C63408FC15;
	Sun, 10 Jun 2012 06:31:54 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5A6VsUH077724;
	Sun, 10 Jun 2012 06:31:54 GMT (envelope-from pjd@svn.freebsd.org)
Received: (from pjd@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5A6Vs2F077722;
	Sun, 10 Jun 2012 06:31:54 GMT (envelope-from pjd@svn.freebsd.org)
Message-Id: <201206100631.q5A6Vs2F077722@svn.freebsd.org>
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Sun, 10 Jun 2012 06:31:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r236832 - head/sys/kern
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 10 Jun 2012 06:31:54 -0000

Author: pjd
Date: Sun Jun 10 06:31:54 2012
New Revision: 236832
URL: http://svn.freebsd.org/changeset/base/236832

Log:
  Simplify fdtofp().
  
  MFC after:	1 month

Modified:
  head/sys/kern/kern_descrip.c

Modified: head/sys/kern/kern_descrip.c
==============================================================================
--- head/sys/kern/kern_descrip.c	Sun Jun 10 05:24:24 2012	(r236831)
+++ head/sys/kern/kern_descrip.c	Sun Jun 10 06:31:54 2012	(r236832)
@@ -430,13 +430,13 @@ sys_fcntl(struct thread *td, struct fcnt
 static inline struct file *
 fdtofp(int fd, struct filedesc *fdp)
 {
-	struct file *fp;
 
 	FILEDESC_LOCK_ASSERT(fdp);
-	if ((unsigned)fd >= fdp->fd_nfiles ||
-	    (fp = fdp->fd_ofiles[fd]) == NULL)
+
+	if ((unsigned)fd >= fdp->fd_nfiles)
 		return (NULL);
-	return (fp);
+
+	return (fdp->fd_ofiles[fd]);
 }
 
 static inline int