diff options
| author | Richard Weinberger <richard@nod.at> | 2021-02-09 21:00:07 +0100 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2021-02-09 21:00:07 +0100 |
| commit | 718d0b6cf1692bcca55c1ef8cadcf0c469ab7c1d (patch) | |
| tree | 64ad2b41f6c9e08bee15c102d0fccbd03c303a80 | |
| parent | 0ce048203eb9f961cfbcc6ecbc7e160e77862bff (diff) | |
| download | misc-fs_fuse_split.tar.gz | |
fuse: Move CUSE to drivers/char/fs_fuse_split
Since CUSE is actually a character device and not a filesystem,
move it into drivers/char/.
Signed-off-by: Richard Weinberger <richard@nod.at>
| -rw-r--r-- | drivers/char/Kconfig | 10 | ||||
| -rw-r--r-- | drivers/char/Makefile | 1 | ||||
| -rw-r--r-- | drivers/char/cuse.c (renamed from fs/fuse/cuse.c) | 0 | ||||
| -rw-r--r-- | fs/fuse/Kconfig | 10 | ||||
| -rw-r--r-- | fs/fuse/Makefile | 1 |
5 files changed, 11 insertions, 11 deletions
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig index d229a2d0c01749..663c8e829c6975 100644 --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig @@ -496,3 +496,13 @@ config RANDOM_TRUST_BOOTLOADER booloader is trustworthy so it will be added to the kernel's entropy pool. Otherwise, say N here so it will be regarded as device input that only mixes the entropy pool. + +config CUSE + tristate "Character device in Userspace support" + depends on FUSE_FS + help + This FUSE extension allows character devices to be + implemented in userspace. + + If you want to develop or use a userspace character device + based on CUSE, answer Y or M. diff --git a/drivers/char/Makefile b/drivers/char/Makefile index ffce287ef41551..527d52e4241adb 100644 --- a/drivers/char/Makefile +++ b/drivers/char/Makefile @@ -47,3 +47,4 @@ obj-$(CONFIG_PS3_FLASH) += ps3flash.o obj-$(CONFIG_XILLYBUS) += xillybus/ obj-$(CONFIG_POWERNV_OP_PANEL) += powernv-op-panel.o obj-$(CONFIG_ADI) += adi.o +obj-$(CONFIG_CUSE) += cuse.o diff --git a/fs/fuse/cuse.c b/drivers/char/cuse.c index 02e382b9863b41..02e382b9863b41 100644 --- a/fs/fuse/cuse.c +++ b/drivers/char/cuse.c diff --git a/fs/fuse/Kconfig b/fs/fuse/Kconfig index 40ce9a1c12e5d1..c32318f37fdca2 100644 --- a/fs/fuse/Kconfig +++ b/fs/fuse/Kconfig @@ -18,16 +18,6 @@ config FUSE_FS If you want to develop a userspace FS, or if you want to use a filesystem based on FUSE, answer Y or M. -config CUSE - tristate "Character device in Userspace support" - depends on FUSE_FS - help - This FUSE extension allows character devices to be - implemented in userspace. - - If you want to develop or use a userspace character device - based on CUSE, answer Y or M. - config VIRTIO_FS tristate "Virtio Filesystem" depends on FUSE_FS diff --git a/fs/fuse/Makefile b/fs/fuse/Makefile index 8c7021fb2cd4f0..d2e877b220992e 100644 --- a/fs/fuse/Makefile +++ b/fs/fuse/Makefile @@ -4,7 +4,6 @@ # obj-$(CONFIG_FUSE_FS) += fuse.o -obj-$(CONFIG_CUSE) += cuse.o obj-$(CONFIG_VIRTIO_FS) += virtiofs.o fuse-y := dev.o dir.o file.o inode.o control.o xattr.o acl.o readdir.o |