Commit 83eb69f3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull exfat filesystem from Al Viro:
 "Shiny new fs/exfat replacement for drivers/staging/exfat"

* 'work.exfat' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  exfat: update file system parameter handling
  staging: exfat: make staging/exfat and fs/exfat mutually exclusive
  MAINTAINERS: add exfat filesystem
  exfat: add Kconfig and Makefile
  exfat: add nls operations
  exfat: add misc operations
  exfat: add exfat cache
  exfat: add bitmap operations
  exfat: add fat entry operations
  exfat: add file operations
  exfat: add directory operations
  exfat: add inode operations
  exfat: add super block operations
  exfat: add in-memory and on-disk structures and headers
parents b3d8e422 9acd0d53

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -6385,6 +6385,13 @@ F: include/trace/events/mdio.h 
F:	include/uapi/linux/mdio.h

F:	include/uapi/linux/mii.h









EXFAT FILE SYSTEM









M:	Namjae Jeon <namjae.jeon@samsung.com>









M:	Sungjong Seo <sj1557.seo@samsung.com>









L:	linux-fsdevel@vger.kernel.org









S:	Maintained









F:	fs/exfat/

















EXT2 FILE SYSTEM









M:	Jan Kara <jack@suse.com>









L:	linux-ext4@vger.kernel.org
































fs/Kconfig



+2
−1






























Original line number
Diff line number
Diff line







@@ -140,9 +140,10 @@ endmenu







endif # BLOCK



















if BLOCK









menu "DOS/FAT/NT Filesystems"









menu "DOS/FAT/EXFAT/NT Filesystems"



















source "fs/fat/Kconfig"









source "fs/exfat/Kconfig"









source "fs/ntfs/Kconfig"



















endmenu
































fs/Makefile



+1
−0






























Original line number
Diff line number
Diff line







@@ -83,6 +83,7 @@ obj-$(CONFIG_HUGETLBFS)		+= hugetlbfs/







obj-$(CONFIG_CODA_FS)		+= coda/









obj-$(CONFIG_MINIX_FS)		+= minix/









obj-$(CONFIG_FAT_FS)		+= fat/









obj-$(CONFIG_EXFAT_FS)		+= exfat/









obj-$(CONFIG_BFS_FS)		+= bfs/









obj-$(CONFIG_ISO9660_FS)	+= isofs/









obj-$(CONFIG_HFSPLUS_FS)	+= hfsplus/ # Before hfs to find wrapped HFS+
































fs/exfat/Kconfig
0 → 100644



+21
−0






























Original line number
Diff line number
Diff line









# SPDX-License-Identifier: GPL-2.0-or-later



















config EXFAT_FS









	tristate "exFAT filesystem support"









	select NLS









	help









	  This allows you to mount devices formatted with the exFAT file system.









	  exFAT is typically used on SD-Cards or USB sticks.



















	  To compile this as a module, choose M here: the module will be called









	  exfat.



















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 to use for









	  converting between the encoding is used for user visible filename and









	  UTF-16 character that exfat filesystem use, and can be overridden with









	  the "iocharset" mount option for exFAT filesystems.
























fs/exfat/Makefile
0 → 100644



+8
−0






























Original line number
Diff line number
Diff line









# SPDX-License-Identifier: GPL-2.0-or-later









#









# Makefile for the linux exFAT filesystem support.









#









obj-$(CONFIG_EXFAT_FS) += exfat.o



















exfat-y	:= inode.o namei.o dir.o super.o fatent.o cache.o nls.o misc.o \









	   file.o balloc.o