Commit 5586c3c1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'work.vboxsf' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull vboxfs from Al Viro:
 "This is the VirtualBox guest shared folder support by Hans de Goede,
  with fixups for fs_parse folded in to avoid bisection hazards from
  those API changes..."

* 'work.vboxsf' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  fs: Add VirtualBox guest shared folder (vboxsf) support
parents 1a2a76c2 0fd16957

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -17791,6 +17791,12 @@ F: include/linux/vbox_utils.h 
F:	include/uapi/linux/vbox*.h

F:	drivers/virt/vboxguest/









VIRTUAL BOX SHARED FOLDER VFS DRIVER:









M:	Hans de Goede <hdegoede@redhat.com>









L:	linux-fsdevel@vger.kernel.org









S:	Maintained









F:	fs/vboxsf/*

















VIRTUAL SERIO DEVICE DRIVER









M:	Stephen Chandler Paul <thatslyude@gmail.com>









S:	Maintained

























fs/Kconfig



+1
−0






























Original line number
Diff line number
Diff line







@@ -264,6 +264,7 @@ source "fs/pstore/Kconfig"







source "fs/sysv/Kconfig"









source "fs/ufs/Kconfig"









source "fs/erofs/Kconfig"









source "fs/vboxsf/Kconfig"



















endif # MISC_FILESYSTEMS










































fs/Makefile



+1
−0






























Original line number
Diff line number
Diff line







@@ -133,3 +133,4 @@ obj-$(CONFIG_CEPH_FS)		+= ceph/







obj-$(CONFIG_PSTORE)		+= pstore/









obj-$(CONFIG_EFIVAR_FS)		+= efivarfs/









obj-$(CONFIG_EROFS_FS)		+= erofs/









obj-$(CONFIG_VBOXSF_FS)		+= vboxsf/
























fs/vboxsf/Kconfig
0 → 100644



+10
−0






























Original line number
Diff line number
Diff line









config VBOXSF_FS









	tristate "VirtualBox guest shared folder (vboxsf) support"









	depends on X86 && VBOXGUEST









	select NLS









	help









	  VirtualBox hosts can share folders with guests, this driver









	  implements the Linux-guest side of this allowing folders exported









	  by the host to be mounted under Linux.



















	  If you want to use shared folders in VirtualBox guests, answer Y or M.
























fs/vboxsf/Makefile
0 → 100644



+5
−0






























Original line number
Diff line number
Diff line









# SPDX-License-Identifier: MIT



















obj-$(CONFIG_VBOXSF_FS) += vboxsf.o



















vboxsf-y := dir.o file.o utils.o vboxsf_wrappers.o super.o