From patchwork Sun May 21 15:40:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabian Frederick X-Patchwork-Id: 9739127 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 50A7F60392 for ; Sun, 21 May 2017 15:41:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 478F228694 for ; Sun, 21 May 2017 15:41:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3C8642869C; Sun, 21 May 2017 15:41:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9CF5E2869D for ; Sun, 21 May 2017 15:41:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756765AbdEUPka (ORCPT ); Sun, 21 May 2017 11:40:30 -0400 Received: from mailrelay108.isp.belgacom.be ([195.238.20.135]:62499 "EHLO mailrelay108.isp.belgacom.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753369AbdEUPk0 (ORCPT ); Sun, 21 May 2017 11:40:26 -0400 X-Belgacom-Dynamic: yes IronPort-PHdr: =?us-ascii?q?9a23=3AUDtqzhcGR8707dr69/zV8xkMlGMj4u6mDksu8pMi?= =?us-ascii?q?zoh2WeGdxcWzYR7h7PlgxGXEQZ/co6odzbGH7ea9BiRAuc/H6yFdNsQUFlcsso?= =?us-ascii?q?Y/oU8JOI2/NQXDNvnkbig3ToxpdWRO2DWFC3VTA9v0fFbIo3e/vnY4ExT7Mhdp?= =?us-ascii?q?dKyuQtaBx8u42Pqv9JLNfg5GmCSyYa9oLBWxsA7dqtQajZFsJ6s1yxbFuHtFdu?= =?us-ascii?q?ZLzm9sOV6fggzw68m08ZNh6Shcp+4t+8tdWqjmYqo0SqBVAzshP20p/sPnsgXN?= =?us-ascii?q?QxWS7XUGSGUWlRRIAwnB7B7kW5r6rzX3uOlg1iSEJMP6Vb87Vyis4KdtUx/olT?= =?us-ascii?q?wINyUl/2HNi8x/l7xUrRS8rBFi2YHUYYWVNP1jfqPBeN4RWGRMUtpNWyFHH4ix?= =?us-ascii?q?dJUEAfYfMulEron9v1oOogW4BQmwH+Pk1ztEimbr0aEmz+gtFAfL1xEiEd0Tqn?= =?us-ascii?q?TZtNX7OrkPX+67z6fGyi7OY+9K1Trn9ITFaAwtre2KULltccTR004vFwbdg1uQ?= =?us-ascii?q?s4PqJDKV2f4Ls2OG7+RgT/yghHM5pAFrozig2sQsgZTOi4Ib0F/L7it5zZ0uJd?= =?us-ascii?q?27SE97Z8CrEIdKuy6BKYR7W8UvSHxrtiYi0rALupy2cDILxZkm3RLSZPOKf5KW?= =?us-ascii?q?7h/sV+ucJypzimh/d7KlnRmy9FCtyuj7VsapzllHtjFFktzQtnAV0BzT99SHRu?= =?us-ascii?q?N9/ki/3TaP0Bje6uVDIU8oj6XbL54hwrkrlpoPq0jDGij2l1nsg6+Sa0ok/e2o?= =?us-ascii?q?5P7mYrXgvpOcNol0hR/iMqk2mcGyA/40PwkPUmSB9umx26fv8VP2TbhJlvE2l7?= =?us-ascii?q?PWsJHeJcQVvK65BApV354t6xmlFDim3s8VnWIELFNFfhKIkZTpN0vVL//mFfu/?= =?us-ascii?q?mUijkC93x/DaOb3sGovNLnnZkLfmZrt86lBTyAwyzdBB/Z5UDrABIPTuWk7+rt?= =?us-ascii?q?DYCQU5MwOuz+b6C9V3zpkeVn6XAq+FLKPStkeF5uYuI+mKeY8Uty/xK/Y+5/Hz?= =?us-ascii?q?k3A5h0ESfa2y0JsJZ3C3AO5mL1+aYXXymNcBF3kFvg4kQOztkl2CXiZZZ2yuUK?= =?us-ascii?q?Ik+jE7FIWmAJ/HRoCshryBwSi6EoRVZm9YEFCMF2nnd4GfVvcSZyKdPNVhniYH?= =?us-ascii?q?Vbe/UY8h0w+htAvgx7pgNOrU9TUStYj/29ht++3TiRYy+CR6D8uHyG6NQXp5nn?= =?us-ascii?q?gLRz422qBwv1B9xk2Y3qdm0LRkEol64/5ZWwE2OISU8e1gDJimRAPbef+bRVCn?= =?us-ascii?q?XJOiADcsXpQ22dBIfkUrSPu4iRWW8SOgArYT35KRCZA56KPX3DClKc93xV7d17?= =?us-ascii?q?gngkVgSMYZZj7uvbJ26wWGX92BqE6ejav/MP1EhCM=3D?= X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: =?us-ascii?q?A2DKAQCUsyFZ//gsQldcHAELAQUBGAELA?= =?us-ascii?q?QUBgj9sKIFGjnqRJAGVSoIPIYYDhX9AGAEBAQEBAQEBAQEBaiiCMyQBgx0jgRo?= =?us-ascii?q?kE4oXEbYShBGHK4ZfgV6LJoJKBYlGlFCKUohADZFwlEgfOIEKTx8YhG0BC4JFP?= =?us-ascii?q?jaJGQEBAQ?= X-IPAS-Result: =?us-ascii?q?A2DKAQCUsyFZ//gsQldcHAELAQUBGAELAQUBgj9sKIFGjnq?= =?us-ascii?q?RJAGVSoIPIYYDhX9AGAEBAQEBAQEBAQEBaiiCMyQBgx0jgRokE4oXEbYShBGHK?= =?us-ascii?q?4ZfgV6LJoJKBYlGlFCKUohADZFwlEgfOIEKTx8YhG0BC4JFPjaJGQEBAQ?= Received: from 248.44-66-87.adsl-dyn.isp.belgacom.be (HELO localhost.localdomain) ([87.66.44.248]) by relay.skynet.be with ESMTP; 21 May 2017 17:40:18 +0200 From: Fabian Frederick To: Alexander Viro Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, fabf@skynet.be Subject: [PATCH 01/11 linux-next] uapi: reorganize magic.h Date: Sun, 21 May 2017 17:40:14 +0200 Message-Id: <20170521154014.26577-1-fabf@skynet.be> X-Mailer: git-send-email 2.9.3 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP -Sort magic.h in alphabetical order as there were no real logic in this file. -Replace all spaces with tabs -Remove excessive comments for reiserfs Signed-off-by: Fabian Frederick --- include/uapi/linux/magic.h | 92 ++++++++++++++++++++-------------------------- 1 file changed, 40 insertions(+), 52 deletions(-) diff --git a/include/uapi/linux/magic.h b/include/uapi/linux/magic.h index e230af2..e3bb43b 100644 --- a/include/uapi/linux/magic.h +++ b/include/uapi/linux/magic.h @@ -3,86 +3,74 @@ #define ADFS_SUPER_MAGIC 0xadf5 #define AFFS_SUPER_MAGIC 0xadff -#define AFS_SUPER_MAGIC 0x5346414F +#define AFS_SUPER_MAGIC 0x5346414F +#define ANON_INODE_FS_MAGIC 0x09041934 #define AUTOFS_SUPER_MAGIC 0x0187 +#define BALLOON_KVM_MAGIC 0x13661366 +#define BDEVFS_MAGIC 0x62646576 +#define BINFMTFS_MAGIC 0x42494e4d +#define BPF_FS_MAGIC 0xcafe4a11 +#define BTRFS_SUPER_MAGIC 0x9123683E +#define BTRFS_TEST_MAGIC 0x73727279 +#define CGROUP2_SUPER_MAGIC 0x63677270 +#define CGROUP_SUPER_MAGIC 0x27e0eb #define CODA_SUPER_MAGIC 0x73757245 #define CRAMFS_MAGIC 0x28cd3d45 /* some random number */ #define CRAMFS_MAGIC_WEND 0x453dcd28 /* magic number with the wrong endianess */ -#define DEBUGFS_MAGIC 0x64626720 -#define SECURITYFS_MAGIC 0x73636673 -#define SELINUX_MAGIC 0xf97cff8c -#define SMACK_MAGIC 0x43415d53 /* "SMAC" */ -#define RAMFS_MAGIC 0x858458f6 /* some random number */ -#define TMPFS_MAGIC 0x01021994 -#define HUGETLBFS_MAGIC 0x958458f6 /* some random number */ -#define SQUASHFS_MAGIC 0x73717368 +#define DAXFS_MAGIC 0x64646178 +#define DEBUGFS_MAGIC 0x64626720 +#define DEVPTS_SUPER_MAGIC 0x1cd1 #define ECRYPTFS_SUPER_MAGIC 0xf15f +#define EFIVARFS_MAGIC 0xde5e81e4 #define EFS_SUPER_MAGIC 0x414A53 #define EXT2_SUPER_MAGIC 0xEF53 #define EXT3_SUPER_MAGIC 0xEF53 -#define XENFS_SUPER_MAGIC 0xabba1974 #define EXT4_SUPER_MAGIC 0xEF53 -#define BTRFS_SUPER_MAGIC 0x9123683E -#define NILFS_SUPER_MAGIC 0x3434 #define F2FS_SUPER_MAGIC 0xF2F52010 +#define FUTEXFS_SUPER_MAGIC 0xBAD1DEA +#define HOSTFS_SUPER_MAGIC 0x00c0ffee #define HPFS_SUPER_MAGIC 0xf995e849 +#define HUGETLBFS_MAGIC 0x958458f6 /* some random number */ #define ISOFS_SUPER_MAGIC 0x9660 #define JFFS2_SUPER_MAGIC 0x72b6 -#define PSTOREFS_MAGIC 0x6165676C -#define EFIVARFS_MAGIC 0xde5e81e4 -#define HOSTFS_SUPER_MAGIC 0x00c0ffee -#define OVERLAYFS_SUPER_MAGIC 0x794c7630 - -#define MINIX_SUPER_MAGIC 0x137F /* minix v1 fs, 14 char names */ -#define MINIX_SUPER_MAGIC2 0x138F /* minix v1 fs, 30 char names */ #define MINIX2_SUPER_MAGIC 0x2468 /* minix v2 fs, 14 char names */ #define MINIX2_SUPER_MAGIC2 0x2478 /* minix v2 fs, 30 char names */ #define MINIX3_SUPER_MAGIC 0x4d5a /* minix v3 fs, 60 char names */ - +#define MINIX_SUPER_MAGIC 0x137F /* minix v1 fs, 14 char names */ +#define MINIX_SUPER_MAGIC2 0x138F /* minix v1 fs, 30 char names */ #define MSDOS_SUPER_MAGIC 0x4d44 /* MD */ +#define MTD_INODE_FS_MAGIC 0x11307854 #define NCP_SUPER_MAGIC 0x564c /* Guess, what 0x564c is :-) */ #define NFS_SUPER_MAGIC 0x6969 +#define NILFS_SUPER_MAGIC 0x3434 +#define NSFS_MAGIC 0x6e736673 #define OPENPROM_SUPER_MAGIC 0x9fa1 +#define OVERLAYFS_SUPER_MAGIC 0x794c7630 +#define PIPEFS_MAGIC 0x50495045 +#define PROC_SUPER_MAGIC 0x9fa0 +#define PSTOREFS_MAGIC 0x6165676C #define QNX4_SUPER_MAGIC 0x002f /* qnx4 fs detection */ #define QNX6_SUPER_MAGIC 0x68191122 /* qnx6 fs detection */ - +#define RAMFS_MAGIC 0x858458f6 /* some random number */ +#define RDTGROUP_SUPER_MAGIC 0x7655821 +#define REISER2FS_JR_SUPER_MAGIC_STRING "ReIsEr3Fs" +#define REISER2FS_SUPER_MAGIC_STRING "ReIsEr2Fs" #define REISERFS_SUPER_MAGIC 0x52654973 /* used by gcc */ - /* used by file system utilities that - look at the superblock, etc. */ #define REISERFS_SUPER_MAGIC_STRING "ReIsErFs" -#define REISER2FS_SUPER_MAGIC_STRING "ReIsEr2Fs" -#define REISER2FS_JR_SUPER_MAGIC_STRING "ReIsEr3Fs" - +#define SECURITYFS_MAGIC 0x73636673 +#define SELINUX_MAGIC 0xf97cff8c +#define SMACK_MAGIC 0x43415d53 /* "SMAC" */ #define SMB_SUPER_MAGIC 0x517B -#define CGROUP_SUPER_MAGIC 0x27e0eb -#define CGROUP2_SUPER_MAGIC 0x63677270 - -#define RDTGROUP_SUPER_MAGIC 0x7655821 - -#define STACK_END_MAGIC 0x57AC6E9D - -#define TRACEFS_MAGIC 0x74726163 - -#define V9FS_MAGIC 0x01021997 - -#define BDEVFS_MAGIC 0x62646576 -#define DAXFS_MAGIC 0x64646178 -#define BINFMTFS_MAGIC 0x42494e4d -#define DEVPTS_SUPER_MAGIC 0x1cd1 -#define FUTEXFS_SUPER_MAGIC 0xBAD1DEA -#define PIPEFS_MAGIC 0x50495045 -#define PROC_SUPER_MAGIC 0x9fa0 #define SOCKFS_MAGIC 0x534F434B +#define SQUASHFS_MAGIC 0x73717368 +#define STACK_END_MAGIC 0x57AC6E9D #define SYSFS_MAGIC 0x62656572 +#define TMPFS_MAGIC 0x01021994 +#define TRACEFS_MAGIC 0x74726163 +#define UDF_SUPER_MAGIC 0x15013346 /* Since UDF 2.01 is ISO 13346 based... */ #define USBDEVICE_SUPER_MAGIC 0x9fa2 -#define MTD_INODE_FS_MAGIC 0x11307854 -#define ANON_INODE_FS_MAGIC 0x09041934 -#define BTRFS_TEST_MAGIC 0x73727279 -#define NSFS_MAGIC 0x6e736673 -#define BPF_FS_MAGIC 0xcafe4a11 -/* Since UDF 2.01 is ISO 13346 based... */ -#define UDF_SUPER_MAGIC 0x15013346 -#define BALLOON_KVM_MAGIC 0x13661366 +#define V9FS_MAGIC 0x01021997 +#define XENFS_SUPER_MAGIC 0xabba1974 #define ZSMALLOC_MAGIC 0x58295829 #endif /* __LINUX_MAGIC_H__ */