diff options
| author |   Jan Engelhardt <jengelh@linux01.gwdg.de> | 2006-06-25 05:48:49 -0700 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-25 10:01:19 -0700 |
| commit | 3e8c54fad89144b8d63cc41619f363df1ec7cc42 (patch) | |
| tree | f4a6f24792358ca7eb3703487eee7db7a122e6f0 /include | |
| parent | [PATCH] Another couple of alterations to the memory barrier doc (diff) | |
| download | linux-dev-3e8c54fad89144b8d63cc41619f363df1ec7cc42.tar.xz linux-dev-3e8c54fad89144b8d63cc41619f363df1ec7cc42.zip | |
[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 <jengelh@gmx.de>
Signed-off-by: Miklos Szeredi <miklos@szeredi.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/fuse.h | 3 |
1 files changed, 2 insertions, 1 deletions
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 <asm/types.h> +#include <linux/major.h> /** 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 |