X Tutup
Skip to content

Commit bbe5371

Browse files
mrc0mmandyuwata
authored andcommitted
basic: update CIFS magic
Kernel commit dea2903719283c156b53741126228c4a1b40440f exposed (and renamed) CIFS_MAGIC_NUMBER as CIFS_SUPER_MAGIC along with SMB2_SUPER_MAGIC. This fixes the following build fail on current Fedora Rawhide: ``` ../src/basic/meson.build:389:8: ERROR: Problem encountered: found unknown filesystem(s) defined in kernel headers: Filesystem found in kernel header but not in filesystems-gperf.gperf: CIFS_SUPER_MAGIC Filesystem found in kernel header but not in filesystems-gperf.gperf: SMB2_SUPER_MAGIC ```
1 parent 156d01b commit bbe5371

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

src/basic/filesystems-gperf.gperf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ ceph, {CEPH_SUPER_MAGIC}
4040
cgroup2, {CGROUP2_SUPER_MAGIC}
4141
# note that the cgroupfs magic got reassigned from cpuset
4242
cgroup, {CGROUP_SUPER_MAGIC}
43-
cifs, {CIFS_MAGIC_NUMBER}
43+
cifs, {CIFS_SUPER_MAGIC, SMB2_SUPER_MAGIC}
4444
coda, {CODA_SUPER_MAGIC}
4545
configfs, {CONFIGFS_MAGIC}
4646
cramfs, {CRAMFS_MAGIC}
@@ -109,7 +109,7 @@ selinuxfs, {SELINUX_MAGIC}
109109
shiftfs, {SHIFTFS_MAGIC}
110110
smackfs, {SMACK_MAGIC}
111111
# smb3 is an alias for cifs
112-
smb3, {CIFS_MAGIC_NUMBER}
112+
smb3, {CIFS_SUPER_MAGIC}
113113
# smbfs was removed from the kernel in 2010, the magic remains
114114
smbfs, {SMB_SUPER_MAGIC}
115115
sockfs, {SOCKFS_MAGIC}

src/basic/missing_magic.h

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,14 @@
3838
#define XFS_SB_MAGIC 0x58465342
3939
#endif
4040

41-
/* Not exposed yet. Defined at fs/cifs/cifsglob.h */
42-
#ifndef CIFS_MAGIC_NUMBER
43-
#define CIFS_MAGIC_NUMBER 0xFF534D42
41+
/* dea2903719283c156b53741126228c4a1b40440f (5.17) */
42+
#ifndef CIFS_SUPER_MAGIC
43+
#define CIFS_SUPER_MAGIC 0xFF534D42
44+
#endif
45+
46+
/* dea2903719283c156b53741126228c4a1b40440f (5.17) */
47+
#ifndef SMB2_SUPER_MAGIC
48+
#define SMB2_SUPER_MAGIC 0xFE534D42
4449
#endif
4550

4651
/* 257f871993474e2bde6c497b54022c362cf398e1 (4.5) */

0 commit comments

Comments
 (0)
X Tutup