From patchwork Sun May 21 15:42:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabian Frederick X-Patchwork-Id: 9739163 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 19BC260328 for ; Sun, 21 May 2017 15:43:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0FB0C2869C for ; Sun, 21 May 2017 15:43:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 048D8286A0; Sun, 21 May 2017 15:43:16 +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=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from aserp1040.oracle.com (aserp1040.oracle.com [141.146.126.69]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 655E32869C for ; Sun, 21 May 2017 15:43:14 +0000 (UTC) Received: from aserv0022.oracle.com (aserv0022.oracle.com [141.146.126.234]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id v4LFgVIp007846 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sun, 21 May 2017 15:42:31 GMT Received: from oss.oracle.com (oss-old-reserved.oracle.com [137.254.22.2]) by aserv0022.oracle.com (8.14.4/8.14.4) with ESMTP id v4LFgUtH000714 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sun, 21 May 2017 15:42:31 GMT Received: from localhost ([127.0.0.1] helo=lb-oss.oracle.com) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from ) id 1dCT02-0005C8-To; Sun, 21 May 2017 08:42:30 -0700 Received: from aserv0021.oracle.com ([141.146.126.233]) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from ) id 1dCT01-0005C0-4W for ocfs2-devel@oss.oracle.com; Sun, 21 May 2017 08:42:29 -0700 Received: from userp2040.oracle.com (userp2040.oracle.com [156.151.31.90]) by aserv0021.oracle.com (8.13.8/8.14.4) with ESMTP id v4LFgSsH011575 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO) for ; Sun, 21 May 2017 15:42:28 GMT Received: from pps.filterd (userp2040.oracle.com [127.0.0.1]) by userp2040.oracle.com (8.16.0.20/8.16.0.20) with SMTP id v4LFd4UU020595 for ; Sun, 21 May 2017 15:42:28 GMT Authentication-Results: oracle.com; spf=pass smtp.mailfrom=fabf@skynet.be Received: from mailrelay108.isp.belgacom.be (mailrelay108.isp.belgacom.be [195.238.20.135]) by userp2040.oracle.com with ESMTP id 2ajce8at17-1 (version=TLSv1.2 cipher=RC4-SHA bits=128 verify=NOT) for ; Sun, 21 May 2017 15:42:28 +0000 X-Belgacom-Dynamic: yes IronPort-PHdr: =?us-ascii?q?9a23=3Acjiljhas4xP6BHQpgNVnc5X/LSx+4OfEezUN459i?= =?us-ascii?q?sYplN5qZps27Yx7h7PlgxGXEQZ/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+FLKPStkeF5uchI+aWf48VuCjyK/g+6v7w?= =?us-ascii?q?k3A5g0Qdfai13ZoXcny3AvNmI0CBa3r2ntgBCXsKvhY5TOHyj12NTTBTZ22sU6?= =?us-ascii?q?4l+z40FpymApnHRo22h7yBxzy7EodRZmBcEF+DDXPoeJueV/gQbyKSJ9drkiYY?= =?us-ascii?q?Wri5V48hyRauuRf+y7pmKOrU5yIZuYvt1Nhu+uLciw8y+iJwD8mGzWGNQH97nn?= =?us-ascii?q?kSSz81wq9/u0p9xUmH0aRihPxYD9NT7etTUggmLZ7c0/B6C9fqVwLFf9eJTkum?= =?us-ascii?q?Q9q/DTEyUN0x2dkObFh5G9i5kBDD0DSlA6UPm7yIGpM06KTc0Gb1J8pnzHbGzq?= =?us-ascii?q?YhhUE8QsRTLW2mmrJ/9w/LCo7HiUqWjKiqeL8H3C7O9GaDy3SBvF1CXAFrT6qW?= =?us-ascii?q?FUwYM2LSoMTw4E/PVfeQCK4gel9fyNSFArlHbNz3y1FHQurzftPEbCSsmDHjKw?= =?us-ascii?q?yPw+aiZYDrcmNV8j/QBEUekgsQtSKIPAIwLjyismTTEHpkGAS8MAvX7eBipSbj?= =?us-ascii?q?HQcPxAaQYhgkjuLt9w=3D=3D?= X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: =?us-ascii?q?A2DKAQCttCFZ//gsQldcHAELAQUBGAELA?= =?us-ascii?q?QUBgj9sKIFGjnqRJAGVSoIPIYYDhX9AGAEBAQEBAQEBAQEBaiiCMyQBgx0jgRo?= =?us-ascii?q?kE4oXEbV4hBGHK4ZfjQSCSgWeFpMSDZFwlEgfOIEKTx8YhG0BC4JFPjaJGQEBA?= =?us-ascii?q?Q?= X-IPAS-Result: =?us-ascii?q?A2DKAQCttCFZ//gsQldcHAELAQUBGAELAQUBgj9sKIFGjnq?= =?us-ascii?q?RJAGVSoIPIYYDhX9AGAEBAQEBAQEBAQEBaiiCMyQBgx0jgRokE4oXEbV4hBGHK?= =?us-ascii?q?4ZfjQSCSgWeFpMSDZFwlEgfOIEKTx8YhG0BC4JFPjaJGQEBAQ?= 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:42:22 +0200 From: Fabian Frederick To: Alexander Viro Date: Sun, 21 May 2017 17:42:17 +0200 Message-Id: <20170521154217.27917-1-fabf@skynet.be> X-Mailer: git-send-email 2.9.3 X-PDR: PASS X-ServerName: mailrelay108.isp.belgacom.be X-Proofpoint-SPF-Result: pass X-Proofpoint-SPF-Record: v=spf1 include:ispmail.spf.secure-mail.be include:bgc.spf.secure-mail.be ip4:206.17.168.28 ip4:94.125.164.65 ~all X-Proofpoint-Virus-Version: vendor=nai engine=5800 definitions=8536 signatures=668458 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 suspectscore=13 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1703280000 definitions=main-1705210096 Cc: linux-fsdevel@vger.kernel.org, fabf@skynet.be, linux-kernel@vger.kernel.org, ocfs2-devel@oss.oracle.com Subject: [Ocfs2-devel] [PATCH 07/11 linux-next] ocfs2: use magic.h X-BeenThere: ocfs2-devel@oss.oracle.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ocfs2-devel-bounces@oss.oracle.com Errors-To: ocfs2-devel-bounces@oss.oracle.com X-Source-IP: aserv0022.oracle.com [141.146.126.234] X-Virus-Scanned: ClamAV using ClamSMTP Filesystems generally use SUPER_MAGIC values from magic.h instead of a local definition. Signed-off-by: Fabian Frederick --- fs/ocfs2/ocfs2_fs.h | 5 ++--- include/uapi/linux/magic.h | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/ocfs2/ocfs2_fs.h b/fs/ocfs2/ocfs2_fs.h index 44d178b..5bb4a89 100644 --- a/fs/ocfs2/ocfs2_fs.h +++ b/fs/ocfs2/ocfs2_fs.h @@ -25,6 +25,8 @@ #ifndef _OCFS2_FS_H #define _OCFS2_FS_H +#include + /* Version */ #define OCFS2_MAJOR_REV_LEVEL 0 #define OCFS2_MINOR_REV_LEVEL 90 @@ -56,9 +58,6 @@ #define OCFS2_MIN_BLOCKSIZE 512 #define OCFS2_MAX_BLOCKSIZE OCFS2_MIN_CLUSTERSIZE -/* Filesystem magic number */ -#define OCFS2_SUPER_MAGIC 0x7461636f - /* Object signatures */ #define OCFS2_SUPER_BLOCK_SIGNATURE "OCFSV2" #define OCFS2_INODE_SIGNATURE "INODE01" diff --git a/include/uapi/linux/magic.h b/include/uapi/linux/magic.h index 905eaa2..2621eaf 100644 --- a/include/uapi/linux/magic.h +++ b/include/uapi/linux/magic.h @@ -47,6 +47,7 @@ #define NFS_SUPER_MAGIC 0x6969 #define NILFS_SUPER_MAGIC 0x3434 #define NSFS_MAGIC 0x6e736673 +#define OCFS2_SUPER_MAGIC 0x7461636f #define OPENPROM_SUPER_MAGIC 0x9fa1 #define ORANGEFS_SUPER_MAGIC 0x20030528 #define OVERLAYFS_SUPER_MAGIC 0x794c7630