[Glibc-bsd-commits] r4189 - in trunk/kfreebsd-9/debian: . patches

[Robert Millan]

Author: rmh
Date: 2012-04-10 15:23:16 +0000 (Tue, 10 Apr 2012)
New Revision: 4189

Added:
   trunk/kfreebsd-9/debian/patches/improve_tmpfs_mem_info.diff
Modified:
   trunk/kfreebsd-9/debian/changelog
   trunk/kfreebsd-9/debian/patches/series
Log:
  * improve_tmpfs_mem_info.diff: Cherry-pick tmpfs allocation from      
    9-STABLE.  (Closes: #666747)

Modified: trunk/kfreebsd-9/debian/changelog
===================================================================
--- trunk/kfreebsd-9/debian/changelog	2012-04-10 10:48:58 UTC (rev 4188)
+++ trunk/kfreebsd-9/debian/changelog	2012-04-10 15:23:16 UTC (rev 4189)
@@ -1,3 +1,10 @@
+kfreebsd-9 (9.0-3) UNRELEASED; urgency=low
+
+  * improve_tmpfs_mem_info.diff: Cherry-pick tmpfs allocation from
+    9-STABLE.  (Closes: #666747)
+
+ -- Robert Millan <rmh at debian.org>  Tue, 10 Apr 2012 17:22:47 +0200
+
 kfreebsd-9 (9.0-2) unstable; urgency=low
 
   * Remove 951_disable_mk_magic.diff, build-depend on freebsd-buildutils

Added: trunk/kfreebsd-9/debian/patches/improve_tmpfs_mem_info.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/improve_tmpfs_mem_info.diff	                        (rev 0)
+++ trunk/kfreebsd-9/debian/patches/improve_tmpfs_mem_info.diff	2012-04-10 15:23:16 UTC (rev 4189)
@@ -0,0 +1,21 @@
+
+Cherry-pick from 9-STABLE (SVN rev 233769).
+
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=666747
+http://www.freebsd.org/cgi/query-pr.cgi?pr=kern/155411
+
+--- a/sys/fs/tmpfs/tmpfs.h
++++ b/sys/fs/tmpfs/tmpfs.h
+@@ -483,11 +483,8 @@
+ 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

Modified: trunk/kfreebsd-9/debian/patches/series
===================================================================
--- trunk/kfreebsd-9/debian/patches/series	2012-04-10 10:48:58 UTC (rev 4188)
+++ trunk/kfreebsd-9/debian/patches/series	2012-04-10 15:23:16 UTC (rev 4189)
@@ -1,4 +1,5 @@
 # Patches from (or merged in) upstream
+improve_tmpfs_mem_info.diff
 
 # Other patches that might or might not be mergeable
 001_misc.diff