From: Jan Engelhardt Date: Sun, 25 Jun 2006 12:48:49 +0000 (-0700) Subject: [PATCH] fuse: use MISC_MAJOR X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3e8c54fad89144b8d63cc41619f363df1ec7cc42;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git [PATCH] fuse: use MISC_MAJOR The following patches add POSIX file locking to the fuse interface. Additional changes ralated to this are: - asynchronous interrupt of requests by SIGKILL no longer supported - separate control filesystem, instead of using sysfs objects - add support for synchronously interrupting requests Details are documented in Documentation/filesystems/fuse.txt throughout the patches. This patch: Have fuse.h use MISC_MAJOR rather than a hardcoded '10'. Signed-off-by: Jan Engelhardt Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/include/linux/fuse.h b/include/linux/fuse.h index 5425b60021e3..8e4319614bef 100644 --- a/include/linux/fuse.h +++ b/include/linux/fuse.h @@ -9,6 +9,7 @@ /* This file defines the kernel interface of FUSE */ #include +#include /** Version number of this interface */ #define FUSE_KERNEL_VERSION 7 @@ -20,7 +21,7 @@ #define FUSE_ROOT_ID 1 /** The major number of the fuse character device */ -#define FUSE_MAJOR 10 +#define FUSE_MAJOR MISC_MAJOR /** The minor number of the fuse character device */ #define FUSE_MINOR 229