Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935720AbeAKTvL (ORCPT + 1 other); Thu, 11 Jan 2018 14:51:11 -0500 Received: from mail-wm0-f67.google.com ([74.125.82.67]:35577 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935677AbeAKTuj (ORCPT ); Thu, 11 Jan 2018 14:50:39 -0500 X-Google-Smtp-Source: ACJfBotGw7Cl0t5WQCrtnuRlJNdOlDnvNRn5w7CXFzh3aHko5Uyr4Egr8gF9F7Gh5WLXsl3r0jUafQ== From: Dongsu Park To: linux-kernel@vger.kernel.org Cc: Alban Crequy , Miklos Szeredi , Mimi Zohar , Seth Forshee , Dongsu Park , linux-fsdevel@vger.kernel.org, linux-integrity@vger.kernel.org Subject: [PATCH 1/2] fs/fuse: move SUPER_MAGIC definitions to linux/magic.h Date: Thu, 11 Jan 2018 20:51:49 +0100 Message-Id: <5aa0e3c3a8d67939940b3469fdae81b9f1a0f920.1515682581.git.dongsu@kinvolk.io> X-Mailer: git-send-email 2.13.6 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: To be able to use FUSE_*SUPER_MAGIC macros in other subsystems like security/integrity/ima, we need to move the definitions from fs/fuse to include/uapi/linux/. The FUSE_*SUPER_MAGIC macros are made available to userspace in the same way as other filesystems. Cc: linux-fsdevel@vger.kernel.org Cc: linux-integrity@vger.kernel.org Cc: linux-kernel@vger.kernel.org Cc: Alban Crequy Cc: Miklos Szeredi Cc: Mimi Zohar Cc: Seth Forshee Signed-off-by: Dongsu Park --- fs/fuse/control.c | 3 +-- fs/fuse/inode.c | 3 +-- include/uapi/linux/magic.h | 3 +++ 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/fs/fuse/control.c b/fs/fuse/control.c index b9ea99c5..9015c15c 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 8c98edee..57371b77 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 1a6fee97..1534e99c 100644 --- a/include/uapi/linux/magic.h +++ b/include/uapi/linux/magic.h @@ -90,4 +90,7 @@ #define BALLOON_KVM_MAGIC 0x13661366 #define ZSMALLOC_MAGIC 0x58295829 +#define FUSE_CTL_SUPER_MAGIC 0x65735543 +#define FUSE_SUPER_MAGIC 0x65735546 + #endif /* __LINUX_MAGIC_H__ */ -- 2.13.6