Revert of Return correct disk free/available size when FS is mounted with size = 0

base/sys_info_posix.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/sys_info.h"
 
 #include <errno.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <string.h>
@@ skipping 10 matching lines @@
 #include "base/threading/thread_restrictions.h"
 #include "build/build_config.h"
 
 #if defined(OS_ANDROID)
 #include <sys/vfs.h>
 #define statvfs statfs  // Android uses a statvfs-like statfs struct and call.
 #else
 #include <sys/statvfs.h>
 #endif
 
-namespace base {
-
 namespace {
 
 #if !defined(OS_OPENBSD)
 int NumberOfProcessors() {
   // sysconf returns the number of "logical" (not "physical") processors on both
   // Mac and Linux.  So we get the number of max available "logical" processors.
   //
   // Note that the number of "currently online" processors may be fewer than the
   // returned value of NumberOfProcessors(). On some platforms, the kernel may
   // make some processors offline intermittently, to save power when system
   // loading is low.
   //
   // One common use case that needs to know the processor count is to create
   // optimal number of threads for optimization. It should make plan according
   // to the number of "max available" processors instead of "currently online"
   // ones. The kernel should be smart enough to make all processors online when
   // it has sufficient number of threads waiting to run.
   long res = sysconf(_SC_NPROCESSORS_CONF);
   if (res == -1) {
     NOTREACHED();
     return 1;
   }
 
   return static_cast<int>(res);
 }
 
-LazyInstance<internal::LazySysInfoValue<int, NumberOfProcessors>>::Leaky
+base::LazyInstance<
+    base::internal::LazySysInfoValue<int, NumberOfProcessors> >::Leaky
     g_lazy_number_of_processors = LAZY_INSTANCE_INITIALIZER;
 #endif
 
 int64_t AmountOfVirtualMemory() {
   struct rlimit limit;
   int result = getrlimit(RLIMIT_DATA, &limit);
   if (result != 0) {
     NOTREACHED();
     return 0;
   }
   return limit.rlim_cur == RLIM_INFINITY ? 0 : limit.rlim_cur;
 }
 
-LazyInstance<internal::LazySysInfoValue<int64_t, AmountOfVirtualMemory>>::Leaky
+base::LazyInstance<
+    base::internal::LazySysInfoValue<int64_t, AmountOfVirtualMemory>>::Leaky
     g_lazy_virtual_memory = LAZY_INSTANCE_INITIALIZER;
 
 bool GetDiskSpaceInfo(const base::FilePath& path,
                       int64_t* available_bytes,
                       int64_t* total_bytes) {
   struct statvfs stats;
   if (HANDLE_EINTR(statvfs(path.value().c_str(), &stats)) != 0)
     return false;
 
-#if defined(OS_LINUX)
-  // On Linux, stats.f_blocks is 0 when memory based file system (like tmpfs,
-  // ramfs, or hugetlbfs), is mounted without any size limit (i.e. size set to
-  // 0).
-  FileSystemType fs_type;
-  const bool zero_size_means_unlimited = stats.f_blocks == 0 &&
-                                         GetFileSystemType(path, &fs_type) &&
-                                         fs_type == FILE_SYSTEM_MEMORY;
-#else
-  const bool zero_size_means_unlimited = false;
-#endif
-
-  if (available_bytes) {
-    *available_bytes =
-        zero_size_means_unlimited
-            ? std::numeric_limits<int64_t>::max()
-            : static_cast<int64_t>(stats.f_bavail) * stats.f_frsize;
-  }
-
-  if (total_bytes) {
-    *total_bytes = zero_size_means_unlimited
-                       ? std::numeric_limits<int64_t>::max()
-                       : static_cast<int64_t>(stats.f_blocks) * stats.f_frsize;
-  }
+  if (available_bytes)
+    *available_bytes = static_cast<int64_t>(stats.f_bavail) * stats.f_frsize;
+  if (total_bytes)
+    *total_bytes = static_cast<int64_t>(stats.f_blocks) * stats.f_frsize;
   return true;
 }
 
 }  // namespace
 
+namespace base {
+
 #if !defined(OS_OPENBSD)
 int SysInfo::NumberOfProcessors() {
   return g_lazy_number_of_processors.Get().value();
 }
 #endif
 
 // static
 int64_t SysInfo::AmountOfVirtualMemory() {
   return g_lazy_virtual_memory.Get().value();
 }
@@ skipping 57 matching lines @@
   }
   return arch;
 }
 
 // static
 size_t SysInfo::VMAllocationGranularity() {
   return getpagesize();
 }
 
 }  // namespace base