From owner-svn-src-stable-7@FreeBSD.ORG  Thu May 28 16:05:23 2009
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 400F8106568C;
	Thu, 28 May 2009 16:05:23 +0000 (UTC)
	(envelope-from dchagin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2D2A38FC1C;
	Thu, 28 May 2009 16:05:23 +0000 (UTC)
	(envelope-from dchagin@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4SG5NAs042739;
	Thu, 28 May 2009 16:05:23 GMT (envelope-from dchagin@svn.freebsd.org)
Received: (from dchagin@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4SG5NQw042738;
	Thu, 28 May 2009 16:05:23 GMT (envelope-from dchagin@svn.freebsd.org)
Message-Id: <200905281605.n4SG5NQw042738@svn.freebsd.org>
From: Dmitry Chagin <dchagin@FreeBSD.org>
Date: Thu, 28 May 2009 16:05:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r192981 - stable/7/sys/compat/linux
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 28 May 2009 16:05:23 -0000

Author: dchagin
Date: Thu May 28 16:05:22 2009
New Revision: 192981
URL: http://svn.freebsd.org/changeset/base/192981

Log:
  Direct commit. Fix error introduced in my r192950 merge.
  Osrel variable should be initialized before use.
  
  Pointyhat to:	me
  
  Approved by:	kib (mentor)

Modified:
  stable/7/sys/compat/linux/linux_mib.c

Modified: stable/7/sys/compat/linux/linux_mib.c
==============================================================================
--- stable/7/sys/compat/linux/linux_mib.c	Thu May 28 15:41:41 2009	(r192980)
+++ stable/7/sys/compat/linux/linux_mib.c	Thu May 28 16:05:22 2009	(r192981)
@@ -267,11 +267,9 @@ linux_kernver(struct thread *td)
 	int osrel;
 
 	pr = td->td_ucred->cr_prison;
-	if (pr != NULL) {
-		if (pr->pr_linux != NULL) {
-			lpr = (struct linux_prison *)pr->pr_linux;
-			osrel = lpr->pr_osrel;
-		}
+	if (pr != NULL && pr->pr_linux != NULL) {
+		lpr = (struct linux_prison *)pr->pr_linux;
+		osrel = lpr->pr_osrel;
 	} else
 		osrel = linux_osrel;
 	return (osrel);