From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Tue, 1 Aug 2017 21:23:24 +0000 (+0200)
Subject: utils: add has_fs_type() + is_fs_type()
X-Git-Tag: lxc-2.0.9~77
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b692229786014accf64326d15d38b2b225a3c262;p=thirdparty%2Flxc.git

utils: add has_fs_type() + is_fs_type()

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---

diff --git a/src/lxc/utils.c b/src/lxc/utils.c
index 2a0273932..5409e7c04 100644
--- a/src/lxc/utils.c
+++ b/src/lxc/utils.c
@@ -2383,3 +2383,25 @@ void *must_realloc(void *orig, size_t sz)
 
 	return ret;
 }
+
+bool is_fs_type(const struct statfs *fs, fs_type_magic magic_val)
+{
+	return (fs->f_type == (fs_type_magic)magic_val);
+}
+
+bool has_fs_type(const char *path, fs_type_magic magic_val)
+{
+	bool has_type;
+	int ret;
+	struct statfs sb;
+
+	ret = statfs(path, &sb);
+	if (ret < 0)
+		return false;
+
+	has_type = is_fs_type(&sb, magic_val);
+	if (!has_type && magic_val == RAMFS_MAGIC)
+		WARN("When the ramfs it a tmpfs statfs() might report tmpfs");
+
+	return has_type;
+}
diff --git a/src/lxc/utils.h b/src/lxc/utils.h
index 990510e36..6351492b7 100644
--- a/src/lxc/utils.h
+++ b/src/lxc/utils.h
@@ -36,6 +36,7 @@
 #include <linux/loop.h>
 #include <sys/syscall.h>
 #include <sys/types.h>
+#include <sys/vfs.h>
 
 #include "initutils.h"
 
@@ -386,4 +387,9 @@ char *must_copy_string(const char *entry);
 /* Re-alllocate a pointer, do not fail */
 void *must_realloc(void *orig, size_t sz);
 
+/* __typeof__ should be safe to use with all compilers. */
+typedef __typeof__(((struct statfs *)NULL)->f_type) fs_type_magic;
+bool has_fs_type(const char *path, fs_type_magic magic_val);
+bool is_fs_type(const struct statfs *fs, fs_type_magic magic_val);
+
 #endif /* __LXC_UTILS_H */