From owner-svn-src-head@FreeBSD.ORG  Sat Apr  7 15:30:47 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 2EA891065679;
	Sat,  7 Apr 2012 15:30:47 +0000 (UTC)
	(envelope-from gleb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1A1EC8FC19;
	Sat,  7 Apr 2012 15:30:47 +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 q37FUkGT067950;
	Sat, 7 Apr 2012 15:30:46 GMT (envelope-from gleb@svn.freebsd.org)
Received: (from gleb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q37FUkqi067948;
	Sat, 7 Apr 2012 15:30:46 GMT (envelope-from gleb@svn.freebsd.org)
Message-Id: <201204071530.q37FUkqi067948@svn.freebsd.org>
From: Gleb Kurtsou <gleb@FreeBSD.org>
Date: Sat, 7 Apr 2012 15:30:46 +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: r234000 - head/sys/fs/tmpfs
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Sat, 07 Apr 2012 15:30:47 -0000

Author: gleb
Date: Sat Apr  7 15:30:46 2012
New Revision: 234000
URL: http://svn.freebsd.org/changeset/base/234000

Log:
  tmpfs supports only INT_MAX nodes due to limitations of unit number
  allocator.
  
  Replace UINT32_MAX checks with INT_MAX. Keeping more than 2^31 nodes in
  memory is not likely to become possible in foreseeable feature and would
  require new unit number allocator.
  
  Discussed with: delphij
  MFC after:	2 weeks

Modified:
  head/sys/fs/tmpfs/tmpfs_vfsops.c

Modified: head/sys/fs/tmpfs/tmpfs_vfsops.c
==============================================================================
--- head/sys/fs/tmpfs/tmpfs_vfsops.c	Sat Apr  7 15:27:34 2012	(r233999)
+++ head/sys/fs/tmpfs/tmpfs_vfsops.c	Sat Apr  7 15:30:46 2012	(r234000)
@@ -130,6 +130,8 @@ tmpfs_node_fini(void *mem, int size)
 static int
 tmpfs_mount(struct mount *mp)
 {
+	const size_t nodes_per_page = howmany(PAGE_SIZE,
+	    sizeof(struct tmpfs_dirent) + sizeof(struct tmpfs_node));
 	struct tmpfs_mount *tmp;
 	struct tmpfs_node *root;
 	int error;
@@ -195,11 +197,13 @@ tmpfs_mount(struct mount *mp)
 	MPASS(pages > 0);
 
 	if (nodes_max <= 3) {
-		if (pages > UINT32_MAX - 3)
-			nodes_max = UINT32_MAX;
+		if (pages < INT_MAX / nodes_per_page)
+			nodes_max = pages * nodes_per_page;
 		else
-			nodes_max = pages + 3;
+			nodes_max = INT_MAX;
 	}
+	if (nodes_max > INT_MAX)
+		nodes_max = INT_MAX;
 	MPASS(nodes_max >= 3);
 
 	/* Allocate the tmpfs mount structure and fill it. */