summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-21 01:36:23 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-21 01:36:23 +0000
commitcdc2c31df29e480467ade48f840b95b5c419d9e4 (patch)
treeafc4e5c7d531fcd65a977e963a2967bc77361a5b /base
parentd41cf1b3fa341feb14407359c9b619aaf83383bc (diff)
downloadchromium_src-cdc2c31df29e480467ade48f840b95b5c419d9e4.zip
chromium_src-cdc2c31df29e480467ade48f840b95b5c419d9e4.tar.gz
chromium_src-cdc2c31df29e480467ade48f840b95b5c419d9e4.tar.bz2
Linux: Fix an error from r249340. RAMFS_MAGIC != HUGETLBFS_MAGIC
Review URL: https://codereview.chromium.org/173363004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@252449 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
-rw-r--r--base/file_util_linux.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/base/file_util_linux.cc b/base/file_util_linux.cc
index 33edc90..14e801c 100644
--- a/base/file_util_linux.cc
+++ b/base/file_util_linux.cc
@@ -18,6 +18,9 @@
#ifndef HUGETLBFS_MAGIC
#define HUGETLBFS_MAGIC 0x958458f6
#endif
+#ifndef RAMFS_MAGIC
+#define RAMFS_MAGIC 0x858458f6
+#endif
#ifndef TMPFS_MAGIC
#define TMPFS_MAGIC 0x01021994
#endif
@@ -58,7 +61,8 @@ bool GetFileSystemType(const base::FilePath& path, FileSystemType* type) {
case CODA_SUPER_MAGIC:
*type = FILE_SYSTEM_CODA;
break;
- case HUGETLBFS_MAGIC: // AKA ramfs
+ case HUGETLBFS_MAGIC:
+ case RAMFS_MAGIC:
case TMPFS_MAGIC:
*type = FILE_SYSTEM_MEMORY;
break;