From patchwork Sun May 21 15:40:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabian Frederick X-Patchwork-Id: 9739133 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 A16B260328 for ; Sun, 21 May 2017 15:41:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 985E328694 for ; Sun, 21 May 2017 15:41:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8D5632869C; Sun, 21 May 2017 15:41:26 +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 476B528694 for ; Sun, 21 May 2017 15:41:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756829AbdEUPlO (ORCPT ); Sun, 21 May 2017 11:41:14 -0400 Received: from mailrelay108.isp.belgacom.be ([195.238.20.135]:62615 "EHLO mailrelay108.isp.belgacom.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752665AbdEUPlM (ORCPT ); Sun, 21 May 2017 11:41:12 -0400 X-Belgacom-Dynamic: yes IronPort-PHdr: =?us-ascii?q?9a23=3AIWJAthekCTX/yk/vChdiKNynlGMj4u6mDksu8pMi?= =?us-ascii?q?zoh2WeGdxcuzYR7h7PlgxGXEQZ/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/DaOb3sGpTNIWXZkLbherZ97klcyBQowNBQ4pJbELABIPbpVkDts9?= =?us-ascii?q?zYC0xxDwvh6uLqGNx72o4EEVyOGKjRZL3Tq1ig9O8pIvfKYI4TpSa7LOIqoePt?= =?us-ascii?q?2ywXg1gYKIeg15oebjiWBPlqLl+Yanmk1tkIG2kipQkvSuH2zlePB20AL02uVr?= =?us-ascii?q?4xs2loQLmtCp3OE8X02OSM?= X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: =?us-ascii?q?A2DKAQCttCFZ//gsQldcHAELAQUBGAELA?= =?us-ascii?q?QUBgj9sKIFGjnqRJAGVSoIPIYYDhX9AGAEBAQEBAQEBAQEBaiiCMyQBgx0jgRo?= =?us-ascii?q?kE4oXEbV4hBGHK4ZfjQSCSgWeFpMSDZFwlEgfOIEKTx8YhG0BglA+NokZAQEB?= X-IPAS-Result: =?us-ascii?q?A2DKAQCttCFZ//gsQldcHAELAQUBGAELAQUBgj9sKIFGjnq?= =?us-ascii?q?RJAGVSoIPIYYDhX9AGAEBAQEBAQEBAQEBaiiCMyQBgx0jgRokE4oXEbV4hBGHK?= =?us-ascii?q?4ZfjQSCSgWeFpMSDZFwlEgfOIEKTx8YhG0BglA+NokZAQEB?= 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:51 +0200 From: Fabian Frederick To: Alexander Viro Cc: Ilya Dryomov , ceph-devel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, fabf@skynet.be Subject: [PATCH 03/11 linux-next] ceph: use magic.h Date: Sun, 21 May 2017 17:40:45 +0200 Message-Id: <20170521154045.26925-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 Filesystems generally use SUPER_MAGIC values from magic.h instead of a local definition. Signed-off-by: Fabian Frederick --- fs/ceph/super.h | 4 +--- include/uapi/linux/magic.h | 1 + 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/fs/ceph/super.h b/fs/ceph/super.h index a973acd..8be85c4 100644 --- a/fs/ceph/super.h +++ b/fs/ceph/super.h @@ -15,6 +15,7 @@ #include #include #include +#include #include @@ -22,9 +23,6 @@ #include #endif -/* f_type in struct statfs */ -#define CEPH_SUPER_MAGIC 0x00c36400 - /* large granularity for statfs utilization stats to facilitate * large volume sizes on 32-bit machines. */ #define CEPH_BLOCK_SHIFT 22 /* 4 MB */ diff --git a/include/uapi/linux/magic.h b/include/uapi/linux/magic.h index 1265355..507f3c3 100644 --- a/include/uapi/linux/magic.h +++ b/include/uapi/linux/magic.h @@ -12,6 +12,7 @@ #define BPF_FS_MAGIC 0xcafe4a11 #define BTRFS_SUPER_MAGIC 0x9123683E #define BTRFS_TEST_MAGIC 0x73727279 +#define CEPH_SUPER_MAGIC 0x00c36400 #define CGROUP2_SUPER_MAGIC 0x63677270 #define CGROUP_SUPER_MAGIC 0x27e0eb #define CODA_SUPER_MAGIC 0x73757245