Merge tag 'upstream/1.5.0+dfsg'

Upstream version 1.5.0+dfsg

1 files changed, 16 insertions, 1 deletions

diff --git a/src/proc_self_mountinfo.h b/src/proc_self_mountinfo.h
index c2d9688c1..00cf699ab 100644
--- a/src/proc_self_mountinfo.h
+++ b/src/proc_self_mountinfo.h
@@ -1,12 +1,23 @@
 #ifndef NETDATA_PROC_SELF_MOUNTINFO_H
 #define NETDATA_PROC_SELF_MOUNTINFO_H 1
 
+#define MOUNTINFO_IS_DUMMY      0x00000001
+#define MOUNTINFO_IS_REMOTE     0x00000002
+#define MOUNTINFO_IS_BIND       0x00000004
+#define MOUNTINFO_IS_SAME_DEV   0x00000008
+#define MOUNTINFO_NO_STAT       0x00000010
+#define MOUNTINFO_NO_SIZE       0x00000020
+#define MOUNTINFO_READONLY      0x00000040
+
 struct mountinfo {
     long id;                // mount ID: unique identifier of the mount (may be reused after umount(2)).
     long parentid;          // parent ID: ID of parent mount (or of self for the top of the mount tree).
     unsigned long major;    // major:minor: value of st_dev for files on filesystem (see stat(2)).
     unsigned long minor;
 
+    char *persistent_id;    // a calculated persistent id for the mount point
+    uint32_t persistent_id_hash;
+
     char *root;             // root: root of the mount within the filesystem.
     uint32_t root_hash;
 
@@ -27,6 +38,10 @@ struct mountinfo {
 
     char *super_options;    // super options: per-superblock options.
 
+    uint32_t flags;
+
+    dev_t st_dev;           // id of device as given by stat()
+
     struct mountinfo *next;
 };
 
@@ -35,6 +50,6 @@ extern struct mountinfo *mountinfo_find_by_filesystem_mount_source(struct mounti
 extern struct mountinfo *mountinfo_find_by_filesystem_super_option(struct mountinfo *root, const char *filesystem, const char *super_options);
 
 extern void mountinfo_free(struct mountinfo *mi);
-extern struct mountinfo *mountinfo_read();
+extern struct mountinfo *mountinfo_read(int do_statvfs);
 
 #endif /* NETDATA_PROC_SELF_MOUNTINFO_H */
\ No newline at end of file