From patchwork Sun May 21 15:42:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabian Frederick X-Patchwork-Id: 9739169 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 D37DA60328 for ; Sun, 21 May 2017 15:43:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CA65D2869D for ; Sun, 21 May 2017 15:43:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BD504286C7; Sun, 21 May 2017 15:43:39 +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 4E5B82869D for ; Sun, 21 May 2017 15:43:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756977AbdEUPml (ORCPT ); Sun, 21 May 2017 11:42:41 -0400 Received: from mailrelay108.isp.belgacom.be ([195.238.20.135]:43325 "EHLO mailrelay108.isp.belgacom.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756969AbdEUPmj (ORCPT ); Sun, 21 May 2017 11:42:39 -0400 X-Belgacom-Dynamic: yes IronPort-PHdr: =?us-ascii?q?9a23=3ADsX9hhK5vsWaBXxD9tmcpTZWNBhigK39O0sv0rFi?= =?us-ascii?q?tYgXKvj+rarrMEGX3/hxlliBBdydsKMazbeJ++C4ACpbsMnH6ChDOLV3FDY7yu?= =?us-ascii?q?wu3DYcSPafDkP6KPO4JwcbJ+9lEGFfwnegLEJOE9z/bVCB6le77DoVBwmtfVEt?= =?us-ascii?q?fre9FYHdldm42P6v8JPPfQpImCC9YbRvJxmqsAndrMcbjI9jJ6oryhbEoGZDd+?= =?us-ascii?q?BKyW91P16ekRLx68Wq8JJ/7yhcvu8q+tJdX6n9Y6k3QrtUASg8PWwy+MPlqwTI?= =?us-ascii?q?QxGV5nsbXGUWkx5IDBbA4RrnQJr/sTb0u/Rk1iWCMsL4Ub47WTK576d2UxDokz?= =?us-ascii?q?sINyQ48G7MlMN9ir9QrQ+7qBx+x47UZ5yVNOZ7c6jAc94WWXZNU8BMXCFaHIiy?= =?us-ascii?q?c5UAAPYAPeZAronyuV0OrQelBQKxAO/j0yJEimPq0aE/1ekqDAPI0xE6H98WsH?= =?us-ascii?q?rassj7OqkRX+6y16TE0SnPYulK1Trn9ITEbhYsquyMU7JqdsrRzFEiGQPfgVqL?= =?us-ascii?q?qIzqJTWV3fkNvWiB8eVvSPygi3Qmqw5toTik28AhiofTiY0OxFDJ7j55wIU1JN?= =?us-ascii?q?2+VkF7fcSoH4BOuCyDMYZ9X8AsQ3lwtSs5yLAKo5+2cSkQxJkoyBPTceKLfoeL?= =?us-ascii?q?7x/lSe2fOy13hGh/d7K6nxuy9E+gxfDiWcSsy1ZKqzZFksHLtnAQyxzf8siHRe?= =?us-ascii?q?V5/kemwTuP0wfT5f1eLkAwlarbLIUhwqIqmpoXtkTMAjX5mEHrg6+Rc0Ur4Omo?= =?us-ascii?q?6+L/brXnoJ+TKZN0hxn9P6ksgMCyAOU1PhIBUmWU4+iwyrLu8E7hTLVPlPI2k6?= =?us-ascii?q?3ZsJ7AJcQco660GwFV3Zw45BaxFDqmy9cYnHkBLF1bZBKLlZPmNE/WLPDiEfi/?= =?us-ascii?q?m0iskCtsx/3eIL3hA4/NLn/YnbbgY7l97U9cyBQpwdBb5pJUDKwBIf3pVk/2rt?= =?us-ascii?q?zYAQU1MxG3w+z/EtVyypseWX6TAq+eKK7StF6I5uErI+mLf48Yoy39Kvk76P70?= =?us-ascii?q?k3A2hF4dcbOp3ZsKcHq4BOhpI12FYXrwhdcMCWMKvgs4TOz3h1yOSDBTZ22vUK?= =?us-ascii?q?0i+DE0FoamAJzdRoCinrOBxj23Hp5IaWBcDFCDD3Poe5+DW/cWZyKYOtVhnSAc?= =?us-ascii?q?Vbi9V48h0gmjtAv7y7phM+rV9TQUtZH929hv4e3cixUy+CdqD8SSzW6NVXt4nm?= =?us-ascii?q?AWSD8s2qBwv0h9xk2E0ahijPxSDcZT6O9RUgcmKZ7cyPR3C97oVQ3acNeEU02m?= =?us-ascii?q?QtamADE3UN0x38UCbF1jFIbqsheW9i6nE7YTm7GRTKI16KWUi2bwPcFV2XvA1b?= =?us-ascii?q?dni1ggX9sJMnepwLN8oVv9HYnMxmuQnaejc+wyxiPB+X2CxmnG6E9RWgBYSqbU?= =?us-ascii?q?W30DIEHb+4eqrnjeRqOjXOx0ejBKztSPf+4TMoXk?= X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: =?us-ascii?q?A2DKAQCttCFZ//gsQldcHAELAQUBGAELA?= =?us-ascii?q?QUBgj9sKIFGjnqRJAGVSoIPIYYDhX9AGAEBAQEBAQEBAQEBaiiCMyQBgx0jgRo?= =?us-ascii?q?kE4oXEbV4hBGHK4ZfgV6HW4NLgkoFnhaTEg2RcJRIHziBCk8fGIRtAYJQPjaGX?= =?us-ascii?q?YI8AQEB?= X-IPAS-Result: =?us-ascii?q?A2DKAQCttCFZ//gsQldcHAELAQUBGAELAQUBgj9sKIFGjnq?= =?us-ascii?q?RJAGVSoIPIYYDhX9AGAEBAQEBAQEBAQEBaiiCMyQBgx0jgRokE4oXEbV4hBGHK?= =?us-ascii?q?4ZfgV6HW4NLgkoFnhaTEg2RcJRIHziBCk8fGIRtAYJQPjaGXYI8AQEB?= 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:32 +0200 From: Fabian Frederick To: Alexander Viro Cc: Miklos Szeredi , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, fabf@skynet.be Subject: [PATCH 08/11 linux-next] fuse: use magic.h Date: Sun, 21 May 2017 17:42:29 +0200 Message-Id: <20170521154229.28058-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/fuse/control.c | 3 +-- fs/fuse/inode.c | 3 +-- include/uapi/linux/magic.h | 2 ++ 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/fuse/control.c b/fs/fuse/control.c index b9ea99c..9015c15 100644 --- a/fs/fuse/control.c +++ b/fs/fuse/control.c @@ -10,8 +10,7 @@ #include #include - -#define FUSE_CTL_SUPER_MAGIC 0x65735543 +#include /* * This is non-NULL when the single instance of the control filesystem diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c index 5a1b58f..5362761 100644 --- a/fs/fuse/inode.c +++ b/fs/fuse/inode.c @@ -22,6 +22,7 @@ #include #include #include +#include MODULE_AUTHOR("Miklos Szeredi "); MODULE_DESCRIPTION("Filesystem in Userspace"); @@ -49,8 +50,6 @@ MODULE_PARM_DESC(max_user_congthresh, "Global limit for the maximum congestion threshold an " "unprivileged user can set"); -#define FUSE_SUPER_MAGIC 0x65735546 - #define FUSE_DEFAULT_BLKSIZE 512 /** Maximum number of outstanding background requests */ diff --git a/include/uapi/linux/magic.h b/include/uapi/linux/magic.h index 2621eaf..6afc4b2 100644 --- a/include/uapi/linux/magic.h +++ b/include/uapi/linux/magic.h @@ -29,6 +29,8 @@ #define EXT4_SUPER_MAGIC 0xEF53 #define EXOFS_SUPER_MAGIC 0x5DF5 #define F2FS_SUPER_MAGIC 0xF2F52010 +#define FUSE_CTL_SUPER_MAGIC 0x65735543 +#define FUSE_SUPER_MAGIC 0x65735546 #define FUTEXFS_SUPER_MAGIC 0xBAD1DEA #define HOSTFS_SUPER_MAGIC 0x00c0ffee #define HPFS_SUPER_MAGIC 0xf995e849