From 9a9311f28d8b01bb2b6d9687ba5dca6849509bd7 Mon Sep 17 00:00:00 2001 From: Dan Moseley Date: Sat, 16 Sep 2017 17:23:13 -0700 Subject: [PATCH 01/10] Uppercase --- .../Interop.MountPoints.FormatInfo.cs | 94 +++++++++---------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/src/Common/src/Interop/Unix/System.Native/Interop.MountPoints.FormatInfo.cs b/src/Common/src/Interop/Unix/System.Native/Interop.MountPoints.FormatInfo.cs index a2f601eb437f..29ed661172a4 100644 --- a/src/Common/src/Interop/Unix/System.Native/Interop.MountPoints.FormatInfo.cs +++ b/src/Common/src/Interop/Unix/System.Native/Interop.MountPoints.FormatInfo.cs @@ -21,53 +21,53 @@ internal static partial class Sys /// internal enum UnixFileSystemTypes : long { - adfs = 0xadf5, - affs = 0xADFF, - befs = 0x42465331, - bfs = 0x1BADFACE, - cifs = 0xFF534D42, - coda = 0x73757245, - coherent = 0x012FF7B7, - cramfs = 0x28cd3d45, - devfs = 0x1373, - efs = 0x00414A53, - ext = 0x137D, - ext2_old = 0xEF51, - ext2 = 0xEF53, - ext3 = 0xEF53, - ext4 = 0xEF53, - hfs = 0x4244, - hpfs = 0xF995E849, - hugetlbfs = 0x958458f6, - isofs = 0x9660, - jffs2 = 0x72b6, - jfs = 0x3153464a, - minix_old = 0x137F, /* orig. minix */ - minix = 0x138F, /* 30 char minix */ - minix2 = 0x2468, /* minix V2 */ - minix2v2 = 0x2478, /* minix V2, 30 char names */ - msdos = 0x4d44, - ncpfs = 0x564c, - nfs = 0x6969, - ntfs = 0x5346544e, - openprom = 0x9fa1, - overlay = 0x794c7630, - overlayfs = 0x794c764f, - proc = 0x9fa0, - qnx4 = 0x002f, - reiserfs = 0x52654973, - romfs = 0x7275, - smb = 0x517B, - sysv2 = 0x012FF7B6, - sysv4 = 0x012FF7B5, - tmpfs = 0x01021994, - udf = 0x15013346, - ufs = 0x00011954, - usbdevice = 0x9fa2, - vxfs = 0xa501FCF5, - xenix = 0x012FF7B4, - xfs = 0x58465342, - xiafs = 0x012FD16D, + adfs = 0XADF5, + affs = 0XADFF, + befs = 0X42465331, + bfs = 0X1BADFACE, + cifs = 0XFF534D42, + coda = 0X73757245, + coherent = 0X012FF7B7, + cramfs = 0X28CD3D45, + devfs = 0X1373, + efs = 0X00414A53, + ext = 0X137D, + ext2_old = 0XEF51, + ext2 = 0XEF53, + ext3 = 0XEF53, + ext4 = 0XEF53, + hfs = 0X4244, + hpfs = 0XF995E849, + hugetlbfs = 0X958458F6, + isofs = 0X9660, + jffs2 = 0X72B6, + jfs = 0X3153464A, + minix_old = 0X137F, /* orig. minix */ + minix = 0X138F, /* 30 char minix */ + minix2 = 0X2468, /* minix V2 */ + minix2v2 = 0X2478, /* MINIX V2, 30 char names */ + msdos = 0X4D44, + ncpfs = 0X564C, + nfs = 0X6969, + ntfs = 0X5346544E, + openprom = 0X9FA1, + overlay = 0X794C7630, + overlayfs = 0X794C764F, + proc = 0X9FA0, + qnx4 = 0X002F, + reiserfs = 0X52654973, + romfs = 0X7275, + smb = 0X517B, + sysv2 = 0X012FF7B6, + sysv4 = 0X012FF7B5, + tmpfs = 0X01021994, + udf = 0X15013346, + ufs = 0X00011954, + usbdevice = 0X9FA2, + vxfs = 0XA501FCF5, + xenix = 0X012FF7B4, + xfs = 0X58465342, + xiafs = 0X012FD16D, } [StructLayout(LayoutKind.Sequential)] From 39432daee03df83c118a6d841e8d271f05fdd20a Mon Sep 17 00:00:00 2001 From: Dan Moseley Date: Sat, 16 Sep 2017 17:36:17 -0700 Subject: [PATCH 02/10] Add more filesystems from stat.c. Change to stat names where possible --- .../Interop.MountPoints.FormatInfo.cs | 52 ++++++++++++++++++- 1 file changed, 50 insertions(+), 2 deletions(-) diff --git a/src/Common/src/Interop/Unix/System.Native/Interop.MountPoints.FormatInfo.cs b/src/Common/src/Interop/Unix/System.Native/Interop.MountPoints.FormatInfo.cs index 29ed661172a4..ba923fef6b1a 100644 --- a/src/Common/src/Interop/Unix/System.Native/Interop.MountPoints.FormatInfo.cs +++ b/src/Common/src/Interop/Unix/System.Native/Interop.MountPoints.FormatInfo.cs @@ -23,51 +23,99 @@ internal enum UnixFileSystemTypes : long { adfs = 0XADF5, affs = 0XADFF, + afs = 0X5346414F, + anon-inode = 0X09041934, + aufs = 0X61756673, + autofs = 0X0187, befs = 0X42465331, + bdevfs = 0X62646576, bfs = 0X1BADFACE, + binfmt_misc = 0X42494E4D, + btrfs = 0X9123683E, + ceph = 0X00C36400, + cgroupfs = 0X0027E0EB, cifs = 0XFF534D42, coda = 0X73757245, coherent = 0X012FF7B7, cramfs = 0X28CD3D45, + debugfs = 0X64626720, devfs = 0X1373, + devpts = 0X1CD1, + ecryptfs = 0XF15F, efs = 0X00414A53, ext = 0X137D, ext2_old = 0XEF51, ext2 = 0XEF53, ext3 = 0XEF53, ext4 = 0XEF53, + fat = 0X4006, + fhgfs = 0X19830326, + fuseblk = 0X65735546, + fusectl = 0X65735543, + futexfs = 0X0BAD1DEA, + gfs/gfs2 = 0X1161970, + gpfs = 0X47504653, hfs = 0X4244, hpfs = 0XF995E849, hugetlbfs = 0X958458F6, + inodefs = 0X11307854, + inotifyfs = 0X2BAD1DEA, isofs = 0X9660, + isofs = 0X4004, // R_WIN + isofs = 0X4000, // WIN + jffs = 0X07C0, jffs2 = 0X72B6, jfs = 0X3153464A, + k-afs = 0X6B414653, + lustre = 0X0BD00BD0, minix_old = 0X137F, /* orig. minix */ minix = 0X138F, /* 30 char minix */ minix2 = 0X2468, /* minix V2 */ minix2v2 = 0X2478, /* MINIX V2, 30 char names */ + minix3 = 0X4D5A, + mqueue = 0X19800202, msdos = 0X4D44, - ncpfs = 0X564C, nfs = 0X6969, + nfsd = 0X6E667364, + nilfs = 0X3434, + novell = 0X564C, ntfs = 0X5346544E, openprom = 0X9FA1, + ocfs2 = 0X7461636F, overlay = 0X794C7630, overlayfs = 0X794C764F, + panfs = 0XAAD7AAEA, + pipefs = 0X50495045, proc = 0X9FA0, + pstorefs = 0X6165676C, qnx4 = 0X002F, + qnx6 = 0X68191122, + ramfs = 0X858458F6, reiserfs = 0X52654973, romfs = 0X7275, + rpc_pipefs = 0X67596969, + securityfs = 0X73636673, + selinux = 0XF97CFF8C, smb = 0X517B, + sockfs = 0X534F434B, + squashfs = 0X73717368, + sysfs = 0X62656572, sysv2 = 0X012FF7B6, sysv4 = 0X012FF7B5, tmpfs = 0X01021994, udf = 0X15013346, ufs = 0X00011954, + ufs = 0X54190100, // byteswapped usbdevice = 0X9FA2, + v9fs = 0X01021997, + vmhgfs = 0XBACBACBC, vxfs = 0XA501FCF5, + vzfs = 0X565A4653, + xenfs = 0XABBA1974, xenix = 0X012FF7B4, xfs = 0X58465342, - xiafs = 0X012FD16D, + xia = 0X012FD16D, + zfs = 0X2FC12FC1, } [StructLayout(LayoutKind.Sequential)] From 8064a7a4e9fba2e0b12d53c1c665c7100ca02c48 Mon Sep 17 00:00:00 2001 From: Dan Moseley Date: Sat, 16 Sep 2017 17:47:42 -0700 Subject: [PATCH 03/10] Add some more local friendly names --- .../Interop.MountPoints.FormatInfo.cs | 67 ++++++++++++++++++- 1 file changed, 66 insertions(+), 1 deletion(-) diff --git a/src/Common/src/Interop/Unix/System.Native/Interop.MountPoints.FormatInfo.cs b/src/Common/src/Interop/Unix/System.Native/Interop.MountPoints.FormatInfo.cs index ba923fef6b1a..4b2737d05caa 100644 --- a/src/Common/src/Interop/Unix/System.Native/Interop.MountPoints.FormatInfo.cs +++ b/src/Common/src/Interop/Unix/System.Native/Interop.MountPoints.FormatInfo.cs @@ -191,60 +191,125 @@ private static DriveType GetDriveType(string fileSystemName) case "umview-mod-umfuseiso9660": return DriveType.CDRom; + case "aafs": case "adfs": case "affs": + case "anon-inode FS": case "apfs": + case "autofs": + case "balloon-kvm-fs": + case "bdevfs": case "befs": case "bfs": + case "binfmt_misc": + case "bpf_fs": case "btrfs": + case "btrfs_test": + case "cgroup2fs": + case "cgroupfs": + case "coh": + case "configfs": + case "cramfs": + case "cramfs-wend": + case "daxfs": + case "debugfs": + case "devfs": + case "devpts": case "drvfs": case "ecryptfs": + case "efivarfs": case "efs": + case "exofs": case "ext": case "ext2": case "ext2_old": case "ext3": + case "ext2/ext3": case "ext4": case "ext4dev": + case "f2fs": case "fat": case "fuseblk": case "fuseext2": case "fusefat": + case "futexfs": case "hfs": + case "hfs+": case "hfsplus": + case "hfsx": + case "hostfs": case "hpfs": + case "hugetlbfs": + case "inodefs": + case "inotifyfs": + case "isofs": case "jbd": case "jbd2": - case "jfs": case "jffs": case "jffs2": + case "jfs": + case "logfs": case "lxfs": + case "minix (30 char.)": + case "minix v2 (30 char.)": + case "minix v2": case "minix": case "minix_old": case "minix2": case "minix2v2": + case "minix3": + case "mqueue": + case "mlfs": case "msdos": + case "nilfs": + case "nsfs": + case "ntfs": case "ocfs2": case "omfs": case "openprom": case "overlay": case "overlayfs": case "ntfs": + case "proc": + case "pstorefs": case "qnx4": + case "qnx6": + case "ramfs": + case "rdt": case "reiserfs": + case "romfs": + case "rpc_pipefs": + case "securityfs": + case "selinux": + case "smackfs": + case "sockfs": case "squashfs": case "swap": + case "sysfs": case "sysv": + case "sysv2": + case "sysv4": + case "tmpfs": + case "tracefs": case "ubifs": case "udf": case "ufs": + case "ufs": case "umsdos": case "umview-mod-umfuseext2": + case "usbdevfs": + case "v9fs": + case "vzfs": + case "wslfs": + case "xenfs": case "xenix": case "xfs": + case "xia": case "xiafs": case "xmount": + case "zfs": case "zfs-fuse": + case "zsmallocfs": return DriveType.Fixed; case "9p": From d5764297725608ba1e19867249509543365cd23d Mon Sep 17 00:00:00 2001 From: Dan Moseley Date: Sat, 16 Sep 2017 17:58:52 -0700 Subject: [PATCH 04/10] Add some more remote file types from stat.c --- .../Interop.MountPoints.FormatInfo.cs | 23 ++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/src/Common/src/Interop/Unix/System.Native/Interop.MountPoints.FormatInfo.cs b/src/Common/src/Interop/Unix/System.Native/Interop.MountPoints.FormatInfo.cs index 4b2737d05caa..a016e31f2d28 100644 --- a/src/Common/src/Interop/Unix/System.Native/Interop.MountPoints.FormatInfo.cs +++ b/src/Common/src/Interop/Unix/System.Native/Interop.MountPoints.FormatInfo.cs @@ -229,7 +229,6 @@ private static DriveType GetDriveType(string fileSystemName) case "ext4dev": case "f2fs": case "fat": - case "fuseblk": case "fuseext2": case "fusefat": case "futexfs": @@ -269,7 +268,6 @@ private static DriveType GetDriveType(string fileSystemName) case "openprom": case "overlay": case "overlayfs": - case "ntfs": case "proc": case "pstorefs": case "qnx4": @@ -294,7 +292,6 @@ private static DriveType GetDriveType(string fileSystemName) case "ubifs": case "udf": case "ufs": - case "ufs": case "umsdos": case "umview-mod-umfuseext2": case "usbdevfs": @@ -313,34 +310,54 @@ private static DriveType GetDriveType(string fileSystemName) return DriveType.Fixed; case "9p": + case "acfs": + case "afs": + case "aufs": case "autofs": case "autofs4": case "beaglefs": + case "ceph": case "cifs": case "coda": case "coherent": case "curlftpfs": case "davfs2": case "dlm": + case "fhgfs": case "flickrfs": + case "fuseblk": + case "fusectl": case "fusedav": case "fusesmb": + case "gfs/gfs2": case "gfs2": case "glusterfs-client": case "gmailfs": + case "gpfs": + case "ibrix": + case "k-afs": case "kafs": case "ltspfs": + case "lustre": case "ncpfs": case "nfs": case "nfs4": + case "nfsd": + case "novell": case "obexfs": + case "panfs": + case "pipefs": + case "prl_fs": case "s3ql": case "smb": + case "smb2": case "smbfs": + case "snfs": case "sshfs": case "sysfs": case "sysv2": case "sysv4": + case "vmhgfs": case "vxfs": case "wikipediafs": return DriveType.Network; From 6905dee3571e9edd556df5b0d2e048f60a049f09 Mon Sep 17 00:00:00 2001 From: Dan Moseley Date: Sat, 16 Sep 2017 18:03:14 -0700 Subject: [PATCH 05/10] Add entry to switch present in enum --- .../Interop/Unix/System.Native/Interop.MountPoints.FormatInfo.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Common/src/Interop/Unix/System.Native/Interop.MountPoints.FormatInfo.cs b/src/Common/src/Interop/Unix/System.Native/Interop.MountPoints.FormatInfo.cs index a016e31f2d28..21b091b931bc 100644 --- a/src/Common/src/Interop/Unix/System.Native/Interop.MountPoints.FormatInfo.cs +++ b/src/Common/src/Interop/Unix/System.Native/Interop.MountPoints.FormatInfo.cs @@ -194,6 +194,7 @@ private static DriveType GetDriveType(string fileSystemName) case "aafs": case "adfs": case "affs": + case "anon-inode": case "anon-inode FS": case "apfs": case "autofs": From 48e39477ef07086f6e02a4aa26fee78ec6b32600 Mon Sep 17 00:00:00 2001 From: Dan Moseley Date: Sat, 16 Sep 2017 18:09:14 -0700 Subject: [PATCH 06/10] Build errors --- .../Interop.MountPoints.FormatInfo.cs | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/Common/src/Interop/Unix/System.Native/Interop.MountPoints.FormatInfo.cs b/src/Common/src/Interop/Unix/System.Native/Interop.MountPoints.FormatInfo.cs index 21b091b931bc..6fa733538efd 100644 --- a/src/Common/src/Interop/Unix/System.Native/Interop.MountPoints.FormatInfo.cs +++ b/src/Common/src/Interop/Unix/System.Native/Interop.MountPoints.FormatInfo.cs @@ -24,7 +24,7 @@ internal enum UnixFileSystemTypes : long adfs = 0XADF5, affs = 0XADFF, afs = 0X5346414F, - anon-inode = 0X09041934, + anoninode = 0X09041934, aufs = 0X61756673, autofs = 0X0187, befs = 0X42465331, @@ -53,7 +53,7 @@ internal enum UnixFileSystemTypes : long fuseblk = 0X65735546, fusectl = 0X65735543, futexfs = 0X0BAD1DEA, - gfs/gfs2 = 0X1161970, + gfsgfs2 = 0X1161970, gpfs = 0X47504653, hfs = 0X4244, hpfs = 0XF995E849, @@ -61,12 +61,12 @@ internal enum UnixFileSystemTypes : long inodefs = 0X11307854, inotifyfs = 0X2BAD1DEA, isofs = 0X9660, - isofs = 0X4004, // R_WIN - isofs = 0X4000, // WIN + // isofs = 0X4004, // R_WIN + // isofs = 0X4000, // WIN jffs = 0X07C0, jffs2 = 0X72B6, jfs = 0X3153464A, - k-afs = 0X6B414653, + kafs = 0X6B414653, lustre = 0X0BD00BD0, minix_old = 0X137F, /* orig. minix */ minix = 0X138F, /* 30 char minix */ @@ -105,7 +105,7 @@ internal enum UnixFileSystemTypes : long tmpfs = 0X01021994, udf = 0X15013346, ufs = 0X00011954, - ufs = 0X54190100, // byteswapped + // ufs = 0X54190100, // byteswapped usbdevice = 0X9FA2, v9fs = 0X01021997, vmhgfs = 0XBACBACBC, @@ -194,7 +194,7 @@ private static DriveType GetDriveType(string fileSystemName) case "aafs": case "adfs": case "affs": - case "anon-inode": + case "anoninode": case "anon-inode FS": case "apfs": case "autofs": @@ -330,12 +330,14 @@ private static DriveType GetDriveType(string fileSystemName) case "fusectl": case "fusedav": case "fusesmb": + case "gfsgfs2": case "gfs/gfs2": case "gfs2": case "glusterfs-client": case "gmailfs": case "gpfs": case "ibrix": + case "kafs": case "k-afs": case "kafs": case "ltspfs": From 47d5278885fc40f762fc739a9c290cc9e1e90141 Mon Sep 17 00:00:00 2001 From: Dan Moseley Date: Sat, 16 Sep 2017 18:40:04 -0700 Subject: [PATCH 07/10] Remove Fixed entries that should be RAM --- .../Interop.MountPoints.FormatInfo.cs | 23 ------------------- 1 file changed, 23 deletions(-) diff --git a/src/Common/src/Interop/Unix/System.Native/Interop.MountPoints.FormatInfo.cs b/src/Common/src/Interop/Unix/System.Native/Interop.MountPoints.FormatInfo.cs index 6fa733538efd..2f3a1cb50285 100644 --- a/src/Common/src/Interop/Unix/System.Native/Interop.MountPoints.FormatInfo.cs +++ b/src/Common/src/Interop/Unix/System.Native/Interop.MountPoints.FormatInfo.cs @@ -202,20 +202,14 @@ private static DriveType GetDriveType(string fileSystemName) case "bdevfs": case "befs": case "bfs": - case "binfmt_misc": case "bpf_fs": case "btrfs": case "btrfs_test": case "cgroup2fs": case "cgroupfs": case "coh": - case "configfs": - case "cramfs": case "cramfs-wend": case "daxfs": - case "debugfs": - case "devfs": - case "devpts": case "drvfs": case "ecryptfs": case "efivarfs": @@ -239,10 +233,8 @@ private static DriveType GetDriveType(string fileSystemName) case "hfsx": case "hostfs": case "hpfs": - case "hugetlbfs": case "inodefs": case "inotifyfs": - case "isofs": case "jbd": case "jbd2": case "jffs": @@ -258,7 +250,6 @@ private static DriveType GetDriveType(string fileSystemName) case "minix2": case "minix2v2": case "minix3": - case "mqueue": case "mlfs": case "msdos": case "nilfs": @@ -269,26 +260,19 @@ private static DriveType GetDriveType(string fileSystemName) case "openprom": case "overlay": case "overlayfs": - case "proc": case "pstorefs": case "qnx4": case "qnx6": - case "ramfs": - case "rdt": case "reiserfs": - case "romfs": case "rpc_pipefs": - case "securityfs": case "selinux": case "smackfs": - case "sockfs": case "squashfs": case "swap": case "sysfs": case "sysv": case "sysv2": case "sysv4": - case "tmpfs": case "tracefs": case "ubifs": case "udf": @@ -314,7 +298,6 @@ private static DriveType GetDriveType(string fileSystemName) case "acfs": case "afs": case "aufs": - case "autofs": case "autofs4": case "beaglefs": case "ceph": @@ -327,7 +310,6 @@ private static DriveType GetDriveType(string fileSystemName) case "fhgfs": case "flickrfs": case "fuseblk": - case "fusectl": case "fusedav": case "fusesmb": case "gfsgfs2": @@ -337,7 +319,6 @@ private static DriveType GetDriveType(string fileSystemName) case "gmailfs": case "gpfs": case "ibrix": - case "kafs": case "k-afs": case "kafs": case "ltspfs": @@ -349,7 +330,6 @@ private static DriveType GetDriveType(string fileSystemName) case "novell": case "obexfs": case "panfs": - case "pipefs": case "prl_fs": case "s3ql": case "smb": @@ -357,9 +337,6 @@ private static DriveType GetDriveType(string fileSystemName) case "smbfs": case "snfs": case "sshfs": - case "sysfs": - case "sysv2": - case "sysv4": case "vmhgfs": case "vxfs": case "wikipediafs": From 33850bde1d178eb6a2f766b6c9cf8e7214fb9fab Mon Sep 17 00:00:00 2001 From: Dan Moseley Date: Sat, 16 Sep 2017 18:41:22 -0700 Subject: [PATCH 08/10] comment --- .../Unix/System.Native/Interop.MountPoints.FormatInfo.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Common/src/Interop/Unix/System.Native/Interop.MountPoints.FormatInfo.cs b/src/Common/src/Interop/Unix/System.Native/Interop.MountPoints.FormatInfo.cs index 2f3a1cb50285..f6daf33ee17c 100644 --- a/src/Common/src/Interop/Unix/System.Native/Interop.MountPoints.FormatInfo.cs +++ b/src/Common/src/Interop/Unix/System.Native/Interop.MountPoints.FormatInfo.cs @@ -178,7 +178,7 @@ private static int GetFormatInfoForMountPoint(string name, out string format, ou /// The recognized drive type. private static DriveType GetDriveType(string fileSystemName) { - // This list is based primarily on "man fs", "man mount", "mntent.h", "/proc/filesystems", + // This list is based primarily on "man fs", "man mount", "mntent.h", "/proc/filesystems", coreutils "stat.c", // and "wiki.debian.org/FileSystem". It can be extended over time as we // find additional file systems that should be recognized as a particular drive type. switch (fileSystemName) From ef77ca55e7ad76ef8c9e46fbbc1528cb1e167a05 Mon Sep 17 00:00:00 2001 From: Dan Moseley Date: Sat, 16 Sep 2017 18:45:31 -0700 Subject: [PATCH 09/10] Change case of 0X to 0x --- .../Interop.MountPoints.FormatInfo.cs | 190 +++++++++--------- 1 file changed, 95 insertions(+), 95 deletions(-) diff --git a/src/Common/src/Interop/Unix/System.Native/Interop.MountPoints.FormatInfo.cs b/src/Common/src/Interop/Unix/System.Native/Interop.MountPoints.FormatInfo.cs index f6daf33ee17c..51da69229d07 100644 --- a/src/Common/src/Interop/Unix/System.Native/Interop.MountPoints.FormatInfo.cs +++ b/src/Common/src/Interop/Unix/System.Native/Interop.MountPoints.FormatInfo.cs @@ -21,101 +21,101 @@ internal static partial class Sys /// internal enum UnixFileSystemTypes : long { - adfs = 0XADF5, - affs = 0XADFF, - afs = 0X5346414F, - anoninode = 0X09041934, - aufs = 0X61756673, - autofs = 0X0187, - befs = 0X42465331, - bdevfs = 0X62646576, - bfs = 0X1BADFACE, - binfmt_misc = 0X42494E4D, - btrfs = 0X9123683E, - ceph = 0X00C36400, - cgroupfs = 0X0027E0EB, - cifs = 0XFF534D42, - coda = 0X73757245, - coherent = 0X012FF7B7, - cramfs = 0X28CD3D45, - debugfs = 0X64626720, - devfs = 0X1373, - devpts = 0X1CD1, - ecryptfs = 0XF15F, - efs = 0X00414A53, - ext = 0X137D, - ext2_old = 0XEF51, - ext2 = 0XEF53, - ext3 = 0XEF53, - ext4 = 0XEF53, - fat = 0X4006, - fhgfs = 0X19830326, - fuseblk = 0X65735546, - fusectl = 0X65735543, - futexfs = 0X0BAD1DEA, - gfsgfs2 = 0X1161970, - gpfs = 0X47504653, - hfs = 0X4244, - hpfs = 0XF995E849, - hugetlbfs = 0X958458F6, - inodefs = 0X11307854, - inotifyfs = 0X2BAD1DEA, - isofs = 0X9660, - // isofs = 0X4004, // R_WIN - // isofs = 0X4000, // WIN - jffs = 0X07C0, - jffs2 = 0X72B6, - jfs = 0X3153464A, - kafs = 0X6B414653, - lustre = 0X0BD00BD0, - minix_old = 0X137F, /* orig. minix */ - minix = 0X138F, /* 30 char minix */ - minix2 = 0X2468, /* minix V2 */ - minix2v2 = 0X2478, /* MINIX V2, 30 char names */ - minix3 = 0X4D5A, - mqueue = 0X19800202, - msdos = 0X4D44, - nfs = 0X6969, - nfsd = 0X6E667364, - nilfs = 0X3434, - novell = 0X564C, - ntfs = 0X5346544E, - openprom = 0X9FA1, - ocfs2 = 0X7461636F, - overlay = 0X794C7630, - overlayfs = 0X794C764F, - panfs = 0XAAD7AAEA, - pipefs = 0X50495045, - proc = 0X9FA0, - pstorefs = 0X6165676C, - qnx4 = 0X002F, - qnx6 = 0X68191122, - ramfs = 0X858458F6, - reiserfs = 0X52654973, - romfs = 0X7275, - rpc_pipefs = 0X67596969, - securityfs = 0X73636673, - selinux = 0XF97CFF8C, - smb = 0X517B, - sockfs = 0X534F434B, - squashfs = 0X73717368, - sysfs = 0X62656572, - sysv2 = 0X012FF7B6, - sysv4 = 0X012FF7B5, - tmpfs = 0X01021994, - udf = 0X15013346, - ufs = 0X00011954, - // ufs = 0X54190100, // byteswapped - usbdevice = 0X9FA2, - v9fs = 0X01021997, - vmhgfs = 0XBACBACBC, - vxfs = 0XA501FCF5, - vzfs = 0X565A4653, - xenfs = 0XABBA1974, - xenix = 0X012FF7B4, - xfs = 0X58465342, - xia = 0X012FD16D, - zfs = 0X2FC12FC1, + adfs = 0xADF5, + affs = 0xADFF, + afs = 0x5346414F, + anoninode = 0x09041934, + aufs = 0x61756673, + autofs = 0x0187, + befs = 0x42465331, + bdevfs = 0x62646576, + bfs = 0x1BADFACE, + binfmt_misc = 0x42494E4D, + btrfs = 0x9123683E, + ceph = 0x00C36400, + cgroupfs = 0x0027E0EB, + cifs = 0xFF534D42, + coda = 0x73757245, + coherent = 0x012FF7B7, + cramfs = 0x28CD3D45, + debugfs = 0x64626720, + devfs = 0x1373, + devpts = 0x1CD1, + ecryptfs = 0xF15F, + efs = 0x00414A53, + ext = 0x137D, + ext2_old = 0xEF51, + ext2 = 0xEF53, + ext3 = 0xEF53, + ext4 = 0xEF53, + fat = 0x4006, + fhgfs = 0x19830326, + fuseblk = 0x65735546, + fusectl = 0x65735543, + futexfs = 0x0BAD1DEA, + gfsgfs2 = 0x1161970, + gpfs = 0x47504653, + hfs = 0x4244, + hpfs = 0xF995E849, + hugetlbfs = 0x958458F6, + inodefs = 0x11307854, + inotifyfs = 0x2BAD1DEA, + isofs = 0x9660, + // isofs = 0x4004, // R_WIN + // isofs = 0x4000, // WIN + jffs = 0x07C0, + jffs2 = 0x72B6, + jfs = 0x3153464A, + kafs = 0x6B414653, + lustre = 0x0BD00BD0, + minix_old = 0x137F, /* orig. minix */ + minix = 0x138F, /* 30 char minix */ + minix2 = 0x2468, /* minix V2 */ + minix2v2 = 0x2478, /* MINIX V2, 30 char names */ + minix3 = 0x4D5A, + mqueue = 0x19800202, + msdos = 0x4D44, + nfs = 0x6969, + nfsd = 0x6E667364, + nilfs = 0x3434, + novell = 0x564C, + ntfs = 0x5346544E, + openprom = 0x9FA1, + ocfs2 = 0x7461636F, + overlay = 0x794C7630, + overlayfs = 0x794C764F, + panfs = 0xAAD7AAEA, + pipefs = 0x50495045, + proc = 0x9FA0, + pstorefs = 0x6165676C, + qnx4 = 0x002F, + qnx6 = 0x68191122, + ramfs = 0x858458F6, + reiserfs = 0x52654973, + romfs = 0x7275, + rpc_pipefs = 0x67596969, + securityfs = 0x73636673, + selinux = 0xF97CFF8C, + smb = 0x517B, + sockfs = 0x534F434B, + squashfs = 0x73717368, + sysfs = 0x62656572, + sysv2 = 0x012FF7B6, + sysv4 = 0x012FF7B5, + tmpfs = 0x01021994, + udf = 0x15013346, + ufs = 0x00011954, + // ufs = 0x54190100, // byteswapped + usbdevice = 0x9FA2, + v9fs = 0x01021997, + vmhgfs = 0xBACBACBC, + vxfs = 0xA501FCF5, + vzfs = 0x565A4653, + xenfs = 0xABBA1974, + xenix = 0x012FF7B4, + xfs = 0x58465342, + xia = 0x012FD16D, + zfs = 0x2FC12FC1, } [StructLayout(LayoutKind.Sequential)] From a024d04104e7d7c723598cbb0b2eb0a2f0318ae4 Mon Sep 17 00:00:00 2001 From: Dan Moseley Date: Sat, 16 Sep 2017 18:52:55 -0700 Subject: [PATCH 10/10] Move cramfs to Fixed --- .../Unix/System.Native/Interop.MountPoints.FormatInfo.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Common/src/Interop/Unix/System.Native/Interop.MountPoints.FormatInfo.cs b/src/Common/src/Interop/Unix/System.Native/Interop.MountPoints.FormatInfo.cs index 51da69229d07..b8a610af19cb 100644 --- a/src/Common/src/Interop/Unix/System.Native/Interop.MountPoints.FormatInfo.cs +++ b/src/Common/src/Interop/Unix/System.Native/Interop.MountPoints.FormatInfo.cs @@ -208,6 +208,7 @@ private static DriveType GetDriveType(string fileSystemName) case "cgroup2fs": case "cgroupfs": case "coh": + case "cramfs": case "cramfs-wend": case "daxfs": case "drvfs": @@ -349,7 +350,6 @@ private static DriveType GetDriveType(string fileSystemName) case "binfmt_misc": case "cgroup": case "configfs": - case "cramfs": case "cryptkeeper": case "cpuset": case "debugfs":