History

Merge branch 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs

Pull overlayfs updates from Miklos Szeredi: "This contains several bug fixes and a new mount option 'default_permissions' that allows read-only exported NFS filesystems to be used as lower layer" * 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs: ovl: check dentry positiveness in ovl_cleanup_whiteouts() ovl: setattr: check permissions before copy-up ovl: root: copy attr ovl: move super block magic number to magic.h ovl: use a minimal buffer in ovl_copy_xattr ovl: allow zero size xattr ovl: default permissions

Linus Torvalds committed 10 years ago

Commit e9f57eb2 parents 5c89e9e 84889d46 files · +101 −18Browse files

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

Unified · Split

include/uapi/linux/magic.h+1−0
@@ -31,6 +31,7 @@ · 30 unmodified lines
31#define PSTOREFS_MAGIC 0x6165676C31#define PSTOREFS_MAGIC 0x6165676C
32#define EFIVARFS_MAGIC 0xde5e81e432#define EFIVARFS_MAGIC 0xde5e81e4
33#define HOSTFS_SUPER_MAGIC 0x00c0ffee33#define HOSTFS_SUPER_MAGIC 0x00c0ffee
34#define OVERLAYFS_SUPER_MAGIC 0x794c7630
34 35
35#define MINIX_SUPER_MAGIC 0x137F /* minix v1 fs, 14 char names */36#define MINIX_SUPER_MAGIC 0x137F /* minix v1 fs, 14 char names */
36#define MINIX_SUPER_MAGIC2 0x138F /* minix v1 fs, 30 char names */37#define MINIX_SUPER_MAGIC2 0x138F /* minix v1 fs, 30 char names */