svn commit: r302230 - stable/10/sys/kern

[Bryan Drewery]

Author: bdrewery
Date: Mon Jun 27 21:30:37 2016
New Revision: 302230
URL: https://svnweb.freebsd.org/changeset/base/302230

Log:
  MFC r273351:
  
    Plug unnecessary binvp NULL initialization and test.

Modified:
  stable/10/sys/kern/kern_exec.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/kern/kern_exec.c
==============================================================================
--- stable/10/sys/kern/kern_exec.c	Mon Jun 27 21:25:01 2016	(r302229)
+++ stable/10/sys/kern/kern_exec.c	Mon Jun 27 21:30:37 2016	(r302230)
@@ -372,7 +372,7 @@ do_execve(td, args, mac_p)
 	struct vnode *tracevp = NULL;
 	struct ucred *tracecred = NULL;
 #endif
-	struct vnode *textvp = NULL, *binvp = NULL;
+	struct vnode *textvp = NULL, *binvp;
 	cap_rights_t rights;
 	int credential_changing;
 	int textset;
@@ -446,7 +446,7 @@ interpret:
 		if (error)
 			goto exec_fail;
 
-		binvp  = nd.ni_vp;
+		binvp = nd.ni_vp;
 		imgp->vp = binvp;
 	} else {
 		AUDIT_ARG_FD(args->fd);
@@ -865,7 +865,7 @@ done1:
 	 */
 	if (textvp != NULL)
 		vrele(textvp);
-	if (binvp && error != 0)
+	if (error != 0)
 		vrele(binvp);
 #ifdef KTRACE
 	if (tracevp != NULL)