Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c9170fb authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by lixiang
Browse files

staging: exfat: remove staging version of exfat filesystem



Now that there is a "real" solution for exfat in the vfs tree queued up
to be merged in 5.7-rc1 the "old" exfat code in staging can be removed.

Many thanks to Valdis for doing the work to get this into the tree in
the first place, it was greatly appreciated.

Acked-by: default avatarValdis Kletnieks <valdis.kletnieks@vt.edu>
Cc: Pali Rohár <pali@kernel.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Al Viro <viro@ZenIV.linux.org.uk>
Cc: Namjae Jeon <namjae.jeon@samsung.com>
Cc: Sungjong Seo <sj1557.seo@samsung.com>
Cc: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20200310105421.GA2810679@kroah.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Git-commit: 590a95e418d18894e34cd240b3e7ef278add05c7
Git-repo: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/


[lixiang@codeaurora.org: resolve trivial merge conflicts]
Change-Id: I24f4da72efcbde084f917a2be75dcc5e5c1f711c
Signed-off-by: default avatarlixiang <lixiang@codeaurora.org>
parent 8c86f959
Loading
Loading
Loading
Loading
+0 −5
Original line number Diff line number Diff line
@@ -6158,11 +6158,6 @@ F: include/trace/events/mdio.h
F:	include/uapi/linux/mdio.h
F:	include/uapi/linux/mii.h
EXFAT FILE SYSTEM
M:	Valdis Kletnieks <valdis.kletnieks@vt.edu>
S:	Maintained
F:	drivers/staging/exfat/
EXT2 FILE SYSTEM
M:	Jan Kara <jack@suse.com>
L:	linux-ext4@vger.kernel.org
+0 −2
Original line number Diff line number Diff line
@@ -121,8 +121,6 @@ source "drivers/staging/isdn/Kconfig"
source "drivers/staging/wusbcore/Kconfig"
source "drivers/staging/uwb/Kconfig"

source "drivers/staging/exfat/Kconfig"

source "drivers/staging/qlge/Kconfig"

endif # STAGING
+0 −1
Original line number Diff line number Diff line
@@ -51,5 +51,4 @@ obj-$(CONFIG_KPC2000) += kpc2000/
obj-$(CONFIG_ISDN_CAPI)		+= isdn/
obj-$(CONFIG_UWB)		+= uwb/
obj-$(CONFIG_USB_WUSB)		+= wusbcore/
obj-$(CONFIG_EXFAT_FS)		+= exfat/
obj-$(CONFIG_QLGE)		+= qlge/

drivers/staging/exfat/Kconfig

deleted100644 → 0
+0 −50
Original line number Diff line number Diff line
# SPDX-License-Identifier: GPL-2.0
config EXFAT_FS
	tristate "exFAT fs support"
	depends on BLOCK
	select NLS
	help
	  This adds support for the exFAT file system.

config EXFAT_DONT_MOUNT_VFAT
	bool "Prohibit mounting of fat/vfat filesystems by exFAT"
	depends on EXFAT_FS
	default y
	help
	  By default, the exFAT driver will only mount exFAT filesystems, and refuse
	  to mount fat/vfat filesystems.  Set this to 'n' to allow the exFAT driver
	  to mount these filesystems.

config EXFAT_DISCARD
	bool "enable discard support"
	depends on EXFAT_FS
	default y

config EXFAT_DELAYED_SYNC
	bool "enable delayed sync"
	depends on EXFAT_FS
	default n

config EXFAT_KERNEL_DEBUG
	bool "enable kernel debug features via ioctl"
	depends on EXFAT_FS
	default n

config EXFAT_DEBUG_MSG
	bool "print debug messages"
	depends on EXFAT_FS
	default n

config EXFAT_DEFAULT_CODEPAGE
	int "Default codepage for exFAT"
	default 437
	depends on EXFAT_FS
	help
	  This option should be set to the codepage of your exFAT filesystems.

config EXFAT_DEFAULT_IOCHARSET
	string "Default iocharset for exFAT"
	default "utf8"
	depends on EXFAT_FS
	help
	  Set this to the default input/output character set you'd like exFAT to use.

drivers/staging/exfat/Makefile

deleted100644 → 0
+0 −10
Original line number Diff line number Diff line
# SPDX-License-Identifier: GPL-2.0-or-later

obj-$(CONFIG_EXFAT_FS) += exfat.o

exfat-y :=	exfat_core.o	\
		exfat_super.o	\
		exfat_blkdev.o	\
		exfat_cache.o	\
		exfat_nls.o	\
		exfat_upcase.o
Loading