libblkid/libmount: ntfs: return filesystem type 'ntfs3'

Change the returned filesystem type from 'ntfs' to 'ntfs3', to match
what the kernel/fs/ntfs3 driver calls register_filesystem on [1][2].
This same driver also registers itself as 'ntfs', but then runs in a
"legacy" mode [3] which forces the mount to stay RO.

Link: [1]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/fs/ntfs3/super.c?h=v6.12#n1794
Link: [2]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/fs/ntfs3/super.c?h=v6.12#n1874
Link: [3]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/fs/ntfs3/super.c?h=v6.12#n412
Signed-off-by: Johannes Schneider <johannes.schneider@leica-geosystems.com>

diff --git a/libblkid/src/superblocks/ntfs.c b/libblkid/src/superblocks/ntfs.c
index 8ce557a113c1158aba0c9b86155f66faace3bdfa..42c8565df4e283a61c7223e0534dd61e6d98357f 100644 (file)
--- a/libblkid/src/superblocks/ntfs.c
+++ b/libblkid/src/superblocks/ntfs.c
@@ -248,7 +248,7 @@ int blkid_probe_is_ntfs(blkid_probe pr)
 
 const struct blkid_idinfo ntfs_idinfo =
 {
-       .name           = "ntfs",
+       .name           = "ntfs3",
        .usage          = BLKID_USAGE_FILESYSTEM,
        .probefunc      = probe_ntfs,
        .magics         =

diff --git a/libmount/src/utils.c b/libmount/src/utils.c
index a25be75a6c20d2f225bff2094344558c6dbd9b97..8c3151b7368f6d9a278db75eaf94e2b20282726a 100644 (file)
--- a/libmount/src/utils.c
+++ b/libmount/src/utils.c
@@ -506,7 +506,7 @@ const char *mnt_statfs_get_fstype(struct statfs *vfs)
        case STATFS_NCP_MAGIC:          return "ncp";
        case STATFS_NFS_MAGIC:          return "nfs";
        case STATFS_NILFS_MAGIC:        return "nilfs2";
-       case STATFS_NTFS_MAGIC:         return "ntfs";
+       case STATFS_NTFS_MAGIC:         return "ntfs3";
        case STATFS_OCFS2_MAGIC:        return "ocfs2";
        case STATFS_OMFS_MAGIC:         return "omfs";
        case STATFS_OPENPROMFS_MAGIC:   return "openpromfs";