From owner-svn-src-all@FreeBSD.ORG  Tue May  5 05:49:09 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4E34E10656C3;
	Tue,  5 May 2009 05:49:09 +0000 (UTC)
	(envelope-from jamie@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3D3E88FC0A;
	Tue,  5 May 2009 05:49:09 +0000 (UTC)
	(envelope-from jamie@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 n455n9kU068589;
	Tue, 5 May 2009 05:49:09 GMT (envelope-from jamie@svn.freebsd.org)
Received: (from jamie@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n455n9mU068587;
	Tue, 5 May 2009 05:49:09 GMT (envelope-from jamie@svn.freebsd.org)
Message-Id: <200905050549.n455n9mU068587@svn.freebsd.org>
From: Jamie Gritton <jamie@FreeBSD.org>
Date: Tue, 5 May 2009 05:49:09 +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: r191806 - in head/sys: kern sys
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: Tue, 05 May 2009 05:49:09 -0000

Author: jamie
Date: Tue May  5 05:49:08 2009
New Revision: 191806
URL: http://svn.freebsd.org/changeset/base/191806

Log:
  Add a constant PR_MAXMETHOD to better define the jail/OSD interface.
  
  Reviewed by:	dchagin, kib
  Approved by:	bz (mentor)

Modified:
  head/sys/kern/kern_osd.c
  head/sys/sys/jail.h

Modified: head/sys/kern/kern_osd.c
==============================================================================
--- head/sys/kern/kern_osd.c	Tue May  5 03:51:41 2009	(r191805)
+++ head/sys/kern/kern_osd.c	Tue May  5 05:49:08 2009	(r191806)
@@ -32,6 +32,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/systm.h>
 #include <sys/sysctl.h>
 #include <sys/errno.h>
+#include <sys/jail.h>
 #include <sys/malloc.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
@@ -73,7 +74,7 @@ static osd_method_t *osd_methods[OSD_LAS
 static u_int osd_nslots[OSD_LAST + 1];			/* (m) */
 static osd_destructor_t *osd_destructors[OSD_LAST + 1];	/* (o) */
 static const u_int osd_nmethods[OSD_LAST + 1] = {
-	[OSD_JAIL] = 5,
+	[OSD_JAIL] = PR_MAXMETHOD,
 };
 
 static struct sx osd_module_lock[OSD_LAST + 1];

Modified: head/sys/sys/jail.h
==============================================================================
--- head/sys/sys/jail.h	Tue May  5 03:51:41 2009	(r191805)
+++ head/sys/sys/jail.h	Tue May  5 05:49:08 2009	(r191806)
@@ -189,6 +189,7 @@ struct prison {
 #define	PR_METHOD_SET		2
 #define	PR_METHOD_CHECK		3
 #define	PR_METHOD_ATTACH	4
+#define	PR_MAXMETHOD		5
 
 /*
  * Sysctl-set variables that determine global jail policy