[PATCH] vboxsf: move out of staging to fs/

[Greg Kroah-Hartman]

When Christoph said this code was "good enough to go in now" I thought
he ment to put it in drivers/staging/ for now, when in fact he ment to
put it into the "real" part of the kernel instead.

So move the code to the "real" part of the kernel as it's good enough.

Reported-by: Christoph Hellwig <hch@xxxxxxxxxxxxx>
Cc: Hans de Goede <hdegoede@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---

Christoph, this is what you mean, right?  If so, I'll send this to Linus
later this week, or he can grab it right from this patch :)

thanks,

greg k-h

 MAINTAINERS                                      | 2 +-
 drivers/staging/Kconfig                          | 2 --
 drivers/staging/Makefile                         | 1 -
 fs/Kconfig                                       | 1 +
 fs/Makefile                                      | 1 +
 {drivers/staging => fs}/vboxsf/Kconfig           | 0
 {drivers/staging => fs}/vboxsf/Makefile          | 0
 {drivers/staging => fs}/vboxsf/TODO              | 0
 {drivers/staging => fs}/vboxsf/dir.c             | 0
 {drivers/staging => fs}/vboxsf/file.c            | 0
 {drivers/staging => fs}/vboxsf/shfl_hostintf.h   | 0
 {drivers/staging => fs}/vboxsf/super.c           | 0
 {drivers/staging => fs}/vboxsf/utils.c           | 0
 {drivers/staging => fs}/vboxsf/vboxsf_wrappers.c | 0
 {drivers/staging => fs}/vboxsf/vfsmod.h          | 0
 15 files changed, 3 insertions(+), 4 deletions(-)
 rename {drivers/staging => fs}/vboxsf/Kconfig (100%)
 rename {drivers/staging => fs}/vboxsf/Makefile (100%)
 rename {drivers/staging => fs}/vboxsf/TODO (100%)
 rename {drivers/staging => fs}/vboxsf/dir.c (100%)
 rename {drivers/staging => fs}/vboxsf/file.c (100%)
 rename {drivers/staging => fs}/vboxsf/shfl_hostintf.h (100%)
 rename {drivers/staging => fs}/vboxsf/super.c (100%)
 rename {drivers/staging => fs}/vboxsf/utils.c (100%)
 rename {drivers/staging => fs}/vboxsf/vboxsf_wrappers.c (100%)
 rename {drivers/staging => fs}/vboxsf/vfsmod.h (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index eb19fad370d7..069dc018073d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -17342,7 +17342,7 @@ VIRTUAL BOX SHARED FOLDER VFS DRIVER:
 M:	Hans de Goede <hdegoede@xxxxxxxxxx>
 L:	linux-fsdevel@xxxxxxxxxxxxxxx
 S:	Maintained
-F:	drivers/staging/vboxsf/*
+F:	fs/vboxsf/*
 
 VIRTUAL SERIO DEVICE DRIVER
 M:	Stephen Chandler Paul <thatslyude@xxxxxxxxx>
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index 927d29eb92c6..6f1fa4c849a1 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -125,6 +125,4 @@ source "drivers/staging/exfat/Kconfig"
 
 source "drivers/staging/qlge/Kconfig"
 
-source "drivers/staging/vboxsf/Kconfig"
-
 endif # STAGING
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index f01f04199073..a90f9b308c8d 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -53,4 +53,3 @@ obj-$(CONFIG_UWB)		+= uwb/
 obj-$(CONFIG_USB_WUSB)		+= wusbcore/
 obj-$(CONFIG_EXFAT_FS)		+= exfat/
 obj-$(CONFIG_QLGE)		+= qlge/
-obj-$(CONFIG_VBOXSF_FS)		+= vboxsf/
diff --git a/fs/Kconfig b/fs/Kconfig
index 2501e6f1f965..a6b57d790100 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -321,5 +321,6 @@ endif # NETWORK_FILESYSTEMS
 source "fs/nls/Kconfig"
 source "fs/dlm/Kconfig"
 source "fs/unicode/Kconfig"
+source "fs/vboxsf/Kconfig"
 
 endmenu
diff --git a/fs/Makefile b/fs/Makefile
index 14231b4cf383..aecbb088be47 100644
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -132,3 +132,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/
diff --git a/drivers/staging/vboxsf/Kconfig b/fs/vboxsf/Kconfig
similarity index 100%
rename from drivers/staging/vboxsf/Kconfig
rename to fs/vboxsf/Kconfig
diff --git a/drivers/staging/vboxsf/Makefile b/fs/vboxsf/Makefile
similarity index 100%
rename from drivers/staging/vboxsf/Makefile
rename to fs/vboxsf/Makefile
diff --git a/drivers/staging/vboxsf/TODO b/fs/vboxsf/TODO
similarity index 100%
rename from drivers/staging/vboxsf/TODO
rename to fs/vboxsf/TODO
diff --git a/drivers/staging/vboxsf/dir.c b/fs/vboxsf/dir.c
similarity index 100%
rename from drivers/staging/vboxsf/dir.c
rename to fs/vboxsf/dir.c
diff --git a/drivers/staging/vboxsf/file.c b/fs/vboxsf/file.c
similarity index 100%
rename from drivers/staging/vboxsf/file.c
rename to fs/vboxsf/file.c
diff --git a/drivers/staging/vboxsf/shfl_hostintf.h b/fs/vboxsf/shfl_hostintf.h
similarity index 100%
rename from drivers/staging/vboxsf/shfl_hostintf.h
rename to fs/vboxsf/shfl_hostintf.h
diff --git a/drivers/staging/vboxsf/super.c b/fs/vboxsf/super.c
similarity index 100%
rename from drivers/staging/vboxsf/super.c
rename to fs/vboxsf/super.c
diff --git a/drivers/staging/vboxsf/utils.c b/fs/vboxsf/utils.c
similarity index 100%
rename from drivers/staging/vboxsf/utils.c
rename to fs/vboxsf/utils.c
diff --git a/drivers/staging/vboxsf/vboxsf_wrappers.c b/fs/vboxsf/vboxsf_wrappers.c
similarity index 100%
rename from drivers/staging/vboxsf/vboxsf_wrappers.c
rename to fs/vboxsf/vboxsf_wrappers.c
diff --git a/drivers/staging/vboxsf/vfsmod.h b/fs/vboxsf/vfsmod.h
similarity index 100%
rename from drivers/staging/vboxsf/vfsmod.h
rename to fs/vboxsf/vfsmod.h
-- 
2.24.0