This is the mail archive of the libc-alpha@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: [PATCH 1/3] linux_fsinfo.h: sync with current linux/magic.h


On 01/23/2014 01:24 AM, Mike Frysinger wrote:
> Import the current list of defines available in the kernel headers.
> 
> Signed-off-by: Mike Frysinger <vapier@gentoo.org>

OK to commit.

Reviewed-by: Carlos O'Donell <carlos@redhat.com>

> 2014-01-23  Mike Frysinger  <vapier@gentoo.org>
> 
> 	* sysdeps/unix/sysv/linux/linux_fsinfo.h (AFS_SUPER_MAGIC): Define.
> 	(ANON_INODE_FS_MAGIC): Likewise.
> 	(BDEVFS_MAGIC): Likewise.
> 	(BINFMTFS_MAGIC): Likewise.
> 	(BTRFS_TEST_MAGIC): Likewise.
> 	(CRAMFS_MAGIC_WEND): Likewise.
> 	(DEBUGFS_MAGIC): Likewise.
> 	(ECRYPTFS_SUPER_MAGIC): Likewise.
> 	(EXT3_SUPER_MAGIC): Likewise.
> 	(EXT4_SUPER_MAGIC): Likewise.
> 	(FUTEXFS_SUPER_MAGIC): Likewise.
> 	(HOSTFS_SUPER_MAGIC): Likewise.
> 	(HUGETLBFS_MAGIC): Likewise.
> 	(MINIX3_SUPER_MAGIC): Likewise.
> 	(MTD_INODE_FS_MAGIC): Likewise.
> 	(NILFS_SUPER_MAGIC): Likewise.
> 	(OPENPROM_SUPER_MAGIC): Likewise.
> 	(PIPEFS_MAGIC): Likewise.
> 	(PSTOREFS_MAGIC): Likewise.
> 	(QNX6_SUPER_MAGIC): Likewise.
> 	(RAMFS_MAGIC): Likewise.
> 	(REISERFS_SUPER_MAGIC_STRING): Likewise.
> 	(REISER2FS_SUPER_MAGIC_STRING): Likewise.
> 	(REISER2FS_JR_SUPER_MAGIC_STRING): Likewise.
> 	(SECURITYFS_MAGIC): Likewise.
> 	(SELINUX_MAGIC): Likewise.
> 	(SMACK_MAGIC): Likewise.
> 	(SOCKFS_MAGIC): Likewise.
> 	(SQUASHFS_MAGIC): Likewise.
> 	(STACK_END_MAGIC): Likewise.
> 	(TMPFS_MAGIC): Likewise.
> 	(USBDEVICE_SUPER_MAGIC): Likewise.
> 	(V9FS_MAGIC): Likewise.
> 	(XENFS_SUPER_MAGIC): Likewise.
> 	(CRAMFS_MAGIC): Fix typo in comment.
> 	(EXT2_SUPER_MAGIC): Update comment.
> 	(USBDEVFS_SUPER_MAGIC): Fix sorting order by moving further down.
> ---
>  ChangeLog                              |  40 +++++++++++++
>  sysdeps/unix/sysv/linux/linux_fsinfo.h | 103 +++++++++++++++++++++++++++++++--
>  2 files changed, 139 insertions(+), 4 deletions(-)
> 
> diff --git a/ChangeLog b/ChangeLog
> index 2730a81..bffd8c3 100644
> --- a/ChangeLog
> +++ b/ChangeLog
> @@ -1,3 +1,43 @@
> +2014-01-23  Mike Frysinger  <vapier@gentoo.org>
> +
> +	* sysdeps/unix/sysv/linux/linux_fsinfo.h (AFS_SUPER_MAGIC): Define.
> +	(ANON_INODE_FS_MAGIC): Likewise.
> +	(BDEVFS_MAGIC): Likewise.
> +	(BINFMTFS_MAGIC): Likewise.
> +	(BTRFS_TEST_MAGIC): Likewise.
> +	(CRAMFS_MAGIC_WEND): Likewise.
> +	(DEBUGFS_MAGIC): Likewise.
> +	(ECRYPTFS_SUPER_MAGIC): Likewise.
> +	(EXT3_SUPER_MAGIC): Likewise.
> +	(EXT4_SUPER_MAGIC): Likewise.
> +	(FUTEXFS_SUPER_MAGIC): Likewise.
> +	(HOSTFS_SUPER_MAGIC): Likewise.
> +	(HUGETLBFS_MAGIC): Likewise.
> +	(MINIX3_SUPER_MAGIC): Likewise.
> +	(MTD_INODE_FS_MAGIC): Likewise.
> +	(NILFS_SUPER_MAGIC): Likewise.
> +	(OPENPROM_SUPER_MAGIC): Likewise.
> +	(PIPEFS_MAGIC): Likewise.
> +	(PSTOREFS_MAGIC): Likewise.
> +	(QNX6_SUPER_MAGIC): Likewise.
> +	(RAMFS_MAGIC): Likewise.
> +	(REISERFS_SUPER_MAGIC_STRING): Likewise.
> +	(REISER2FS_SUPER_MAGIC_STRING): Likewise.
> +	(REISER2FS_JR_SUPER_MAGIC_STRING): Likewise.
> +	(SECURITYFS_MAGIC): Likewise.
> +	(SELINUX_MAGIC): Likewise.
> +	(SMACK_MAGIC): Likewise.
> +	(SOCKFS_MAGIC): Likewise.
> +	(SQUASHFS_MAGIC): Likewise.
> +	(STACK_END_MAGIC): Likewise.
> +	(TMPFS_MAGIC): Likewise.
> +	(USBDEVICE_SUPER_MAGIC): Likewise.
> +	(V9FS_MAGIC): Likewise.
> +	(XENFS_SUPER_MAGIC): Likewise.
> +	(CRAMFS_MAGIC): Fix typo in comment.
> +	(EXT2_SUPER_MAGIC): Update comment.
> +	(USBDEVFS_SUPER_MAGIC): Fix sorting order by moving further down.
> +
>  2014-01-22  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
>  
>  	* sysdeps/unix/sysv/linux/s390/s390-32/sys/ucontext.h: Merge into
> diff --git a/sysdeps/unix/sysv/linux/linux_fsinfo.h b/sysdeps/unix/sysv/linux/linux_fsinfo.h
> index 1547ba8..d15d5fb 100644
> --- a/sysdeps/unix/sysv/linux/linux_fsinfo.h
> +++ b/sysdeps/unix/sysv/linux/linux_fsinfo.h
> @@ -30,15 +30,30 @@
>  /* Constant that identifies the `affs' filesystem.  */
>  #define AFFS_SUPER_MAGIC	0xadff
>  
> +/* Constant that identifies the `afs' filesystem.  */
> +#define AFS_SUPER_MAGIC		0x5346414F

OK.

> +
> +/* Constant that identifies the `anon_inodefs' filesystem.  */
> +#define ANON_INODE_FS_MAGIC	0x09041934

OK.

> +
>  /* Constant that identifies the `autofs' filesystem.  */
>  #define AUTOFS_SUPER_MAGIC	0x187
>  
> +/* Constant that identifies the `bdev' filesystem.  */
> +#define BDEVFS_MAGIC		0x62646576
> +

OK.

>  /* Constant that identifies the `bfs' filesystem.  */
>  #define BFS_MAGIC		0x1badface
>  
> +/* Constant that identifies the `binfmt_misc' filesystem.  */
> +#define BINFMTFS_MAGIC		0x42494e4d

OK.

> +
>  /* Constant that identifies the `btrfs' filesystem.  */
>  #define BTRFS_SUPER_MAGIC	0x9123683e
>  
> +/* Constant that identifies the `btrfs_test_fs' filesystem.  */
> +#define BTRFS_TEST_MAGIC	0x73727279

OK.

> +
>  /* Constant that identifies the `cgroup' filesystem.  */
>  #define CGROUP_SUPER_MAGIC	0x27e0eb
>  
> @@ -48,15 +63,24 @@
>  /* Constant that identifies the `coherent' filesystem.  */
>  #define COH_SUPER_MAGIC		0x012ff7b7
>  
> -/* Constant that identifies the `ramfs' filesystem.  */
> +/* Constant that identifies the `cramfs' filesystem.  */

OK.

>  #define CRAMFS_MAGIC		0x28cd3d45
>  
> +/* Constant that identifies the `cramfs' filesystem w/opposite endianness.  */
> +#define CRAMFS_MAGIC_WEND	0x453dcd28

OK.

> +
> +/* Constant that identifies the `debugfs' filesystem.  */
> +#define DEBUGFS_MAGIC		0x64626720

OK.

> +
>  /* Constant that identifies the `devfs' filesystem.  */
>  #define DEVFS_SUPER_MAGIC	0x1373
>  
>  /* Constant that identifies the `devpts' filesystem.  */
>  #define DEVPTS_SUPER_MAGIC	0x1cd1
>  
> +/* Constants that identifies the `ecryptfs' filesystem.  */
> +#define ECRYPTFS_SUPER_MAGIC	0xf15f
> +

OK.

>  /* Constants that identifies the `efs' filesystem.  */
>  #define EFS_SUPER_MAGIC		0x414a53
>  #define EFS_MAGIC		0x072959
> @@ -64,15 +88,30 @@
>  /* Constants that identifies the `evivar' filesystem.  */
>  #define EFIVARFS_MAGIC		0xde5e81e4
>  
> -/* Constant that identifies the `ext2' and `ext3' filesystems.  */
> +/* Constant that identifies the `ext2' filesystem.  */

OK.

>  #define EXT2_SUPER_MAGIC	0xef53
>  
> +/* Constant that identifies the `ext3' filesystem.  */
> +#define EXT3_SUPER_MAGIC	0xef53

OK.

> +
> +/* Constant that identifies the `ext3' filesystem.  */
> +#define EXT4_SUPER_MAGIC	0xef53
> +

OK.

>  /* Constant that identifies the `f2fs' filesystem.  */
>  #define F2FS_SUPER_MAGIC	0xf2f52010
>  
> +/* Constant that identifies the `futexfs' filesystem.  */
> +#define FUTEXFS_SUPER_MAGIC	0xBAD1DEA

OK (this made me snort milk out my nose).

> +
> +/* Constant that identifies the `hostfs' filesystem.  */
> +#define HOSTFS_SUPER_MAGIC	0x00c0ffee
> +

OK.

>  /* Constant that identifies the `hpfs' filesystem.  */
>  #define HPFS_SUPER_MAGIC	0xf995e849
>  
> +/* Constant that identifies the `hugetlbfs' filesystem.  */
> +#define HUGETLBFS_MAGIC 	0x958458f6
> +

OK.

>  /* Constant that identifies the `iso9660' filesystem.  */
>  #define ISOFS_SUPER_MAGIC	0x9660
>  
> @@ -95,6 +134,9 @@
>  #define MINIX2_SUPER_MAGIC	0x2468
>  #define MINIX2_SUPER_MAGIC2	0x2478
>  
> +/* Constants that identify the `minix3' filesystem.  */
> +#define MINIX3_SUPER_MAGIC	0x4d5a

OK.

> +
>  /* Constants that identify the `minix' filesystem.  */
>  #define MINIX_SUPER_MAGIC	0x137f
>  #define MINIX_SUPER_MAGIC2	0x138F
> @@ -102,36 +144,76 @@
>  /* Constant that identifies the `msdos' filesystem.  */
>  #define MSDOS_SUPER_MAGIC	0x4d44
>  
> +/* Constant that identifies the `mtd_inodefs' filesystem.  */
> +#define MTD_INODE_FS_MAGIC	0x11307854

OK.

> +
>  /* Constant that identifies the `ncp' filesystem.  */
>  #define NCP_SUPER_MAGIC		0x564c
>  
> +/* Constant that identifies the `nilfs' filesystem.  */
> +#define NILFS_SUPER_MAGIC	0x3434

OK.

> +
>  /* Constant that identifies the `nfs' filesystem.  */
>  #define NFS_SUPER_MAGIC		0x6969
>  
>  /* Constant that identifies the `ntfs' filesystem.  */
>  #define NTFS_SUPER_MAGIC	0x5346544e
>  
> +/* Constant that identifies the `openpromfs' filesystem.  */
> +#define OPENPROM_SUPER_MAGIC	0x9fa1

OK.

> +
> +/* Constant that identifies the `pipefs' filesystem.  */
> +#define PIPEFS_MAGIC		0x50495045

OK.

> +
>  /* Constant that identifies the `proc' filesystem.  */
>  #define PROC_SUPER_MAGIC	0x9fa0
>  
> -/* Constant that identifies the `usbdevfs' filesystem.  */
> -#define USBDEVFS_SUPER_MAGIC	0x9fa2

OK, moving it below.

> +/* Constant that identifies the `pstorefs' filesystem.  */
> +#define PSTOREFS_MAGIC		0x6165676C

OK.
  
>  /* Constant that identifies the `qnx4' filesystem.  */
>  #define QNX4_SUPER_MAGIC	0x002f
>  
> +/* Constant that identifies the `qnx6' filesystem.  */
> +#define QNX6_SUPER_MAGIC	0x68191122
> +

OK.

> +/* Constant that identifies the `ramfs' filesystem.  */
> +#define RAMFS_MAGIC		0x858458f6
> +

OK.

>  /* Constant that identifies the `reiser' filesystem.  */
>  #define REISERFS_SUPER_MAGIC	0x52654973
>  
> +#define REISERFS_SUPER_MAGIC_STRING	"ReIsErFs"
> +#define REISER2FS_SUPER_MAGIC_STRING	"ReIsEr2Fs"
> +#define REISER2FS_JR_SUPER_MAGIC_STRING	"ReIsEr3Fs"

OK.

> +
>  /* Constant that identifies the `romfs' filesystem.  */
>  #define ROMFS_SUPER_MAGIC	0x7275
>  
> +/* Constant that identifies the `securityfs' filesystem.  */
> +#define SECURITYFS_MAGIC	0x73636673

OK.

> +
> +/* Constant that identifies the `selinuxfs' filesystem.  */
> +#define SELINUX_MAGIC		0xf97cff8c

OK.

> +
> +/* Constant that identifies the `smackfs' filesystem.  */
> +#define SMACK_MAGIC		0x43415d53	/* "SMAC" */

OK.

> +
>  /* Constant that identifies the `shm' filesystem.  */
>  #define SHMFS_SUPER_MAGIC	0x01021994
>  
>  /* Constant that identifies the `smb' filesystem.  */
>  #define SMB_SUPER_MAGIC		0x517b
>  
> +/* Constant that identifies the `sockfs' filesystem.  */
> +#define SOCKFS_MAGIC		0x534F434B

OK.

> +
> +/* Constant that identifies the `squashfs' filesystem.  */
> +#define SQUASHFS_MAGIC		0x73717368

OK.

> +
> +/* Constant that identifies the end of stacks allocated by the kernel.  */
> +#define STACK_END_MAGIC		0x57AC6E9D

OK.

> +
>  /* Constant that identifies the `sysfs' filesystem.  */
>  #define SYSFS_MAGIC		0x62656572
>  
> @@ -139,6 +221,9 @@
>  #define SYSV2_SUPER_MAGIC	0x012ff7b6
>  #define SYSV4_SUPER_MAGIC	0x012ff7b5
>  
> +/* Constant that identifies the `tmpfs' filesystem.  */
> +#define TMPFS_MAGIC		0x01021994

OK.

> +
>  /* Constant that identifies the `udf' filesystem.  */
>  #define UDF_SUPER_MAGIC		0x15013346
>  
> @@ -146,9 +231,19 @@
>  #define UFS_MAGIC		0x00011954
>  #define UFS_CIGAM		0x54190100 /* byteswapped MAGIC */
>  
> +/* Constant that identifies the `usbdevfs' filesystem.  */
> +#define USBDEVFS_SUPER_MAGIC	0x9fa2
> +#define USBDEVICE_SUPER_MAGIC	0x9fa2

OK, nice to see us keeping the old entry too for use
by internal_statvfs.c.

> +
> +/* Constant that identifies the `9p' filesystem.  */
> +#define V9FS_MAGIC		0x01021997

OK.

> +
>  /* Constant that identifies the `vxfs' filesystem.  */
>  #define VXFS_SUPER_MAGIC	0xa501fcf5
>  
> +/* Constant that identifies the `xenfs' filesystem.  */
> +#define XENFS_SUPER_MAGIC	0xabba1974

OK.

> +
>  /* Constant that identifies the `xenix' filesystem.  */
>  #define XENIX_SUPER_MAGIC	0x012ff7b4
>  
> 

Cheers,
Carlos.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]