From owner-svn-src-stable@FreeBSD.ORG  Mon Apr  2 07:18:31 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E54E7106566C;
	Mon,  2 Apr 2012 07:18:31 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D02D88FC14;
	Mon,  2 Apr 2012 07:18:31 +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 q327IVIP086321;
	Mon, 2 Apr 2012 07:18:31 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q327IVAW086319;
	Mon, 2 Apr 2012 07:18:31 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201204020718.q327IVAW086319@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Mon, 2 Apr 2012 07:18:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r233769 - stable/9/sys/fs/tmpfs
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Apr 2012 07:18:32 -0000

Author: delphij
Date: Mon Apr  2 07:18:31 2012
New Revision: 233769
URL: http://svn.freebsd.org/changeset/base/233769

Log:
  MFC r227802:
  
  Improve the way to calculate available pages in tmpfs:
  
   - Don't deduct wired pages from total usable counts because it does not
     make any sense.  To make things worse, on systems where swap size is
     smaller than physical memory and use a lot of wired pages (e.g. ZFS),
     tmpfs can suddenly have free space of 0 because of this;
   - Count cached pages as available; [1]
   - Don't count inactive pages as available, technically we could but that
     might be too aggressive; [1]
  
  [1] Suggested by kib@

Modified:
  stable/9/sys/fs/tmpfs/tmpfs.h
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/fs/   (props changed)

Modified: stable/9/sys/fs/tmpfs/tmpfs.h
==============================================================================
--- stable/9/sys/fs/tmpfs/tmpfs.h	Mon Apr  2 02:22:22 2012	(r233768)
+++ stable/9/sys/fs/tmpfs/tmpfs.h	Mon Apr  2 07:18:31 2012	(r233769)
@@ -502,11 +502,8 @@ int	tmpfs_truncate(struct vnode *, off_t
 static __inline size_t
 tmpfs_mem_info(void)
 {
-	size_t size;
 
-	size = swap_pager_avail + cnt.v_free_count + cnt.v_inactive_count;
-	size -= size > cnt.v_wire_count ? cnt.v_wire_count : size;
-	return size;
+	return (swap_pager_avail + cnt.v_free_count + cnt.v_cache_count);
 }
 
 /* Returns the maximum size allowed for a tmpfs file system.  This macro