History

Merge tag 'fuse-fixes-5.17-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse

Pull fuse fixes from Miklos Szeredi: - Fix an issue with splice on the fuse device - Fix a regression in the fileattr API conversion - Add a small userspace API improvement * tag 'fuse-fixes-5.17-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse: fuse: fix pipe buffer lifetime for direct_io fuse: move FUSE_SUPER_MAGIC definition to magic.h fuse: fix fileattr op failure

Linus Torvalds committed 4 years ago

Commit 92f90cc2 parents cd22a8b 0c4bcfd6 files · +21 −6Browse files

Showing the changes to include/uapi/linux (1 of 6 files). Show all

Unified · Split

include/uapi/linux/magic.h+1−0
@@ -36,6 +36,7 @@ · 35 unmodified lines
36#define EFIVARFS_MAGIC 0xde5e81e436#define EFIVARFS_MAGIC 0xde5e81e4
37#define HOSTFS_SUPER_MAGIC 0x00c0ffee37#define HOSTFS_SUPER_MAGIC 0x00c0ffee
38#define OVERLAYFS_SUPER_MAGIC 0x794c763038#define OVERLAYFS_SUPER_MAGIC 0x794c7630
39#define FUSE_SUPER_MAGIC 0x65735546
39 40
40#define MINIX_SUPER_MAGIC 0x137F /* minix v1 fs, 14 char names */41#define MINIX_SUPER_MAGIC 0x137F /* minix v1 fs, 14 char names */
41#define MINIX_SUPER_MAGIC2 0x138F /* minix v1 fs, 30 char names */42#define MINIX_SUPER_MAGIC2 0x138F /* minix v1 fs, 30 char names */