fs: exfat: remove aligned mpage write

This is basically a fork of fs/mpage.c and causes a lot of headache with supporting various kernel versions. Since this is only used when an undocumented "adj_req" mount option is passed anyways, remove it completely. Signed-off-by: Park Ju Hyung <qkrwngud825@gmail.com> Signed-off-by: Khusika Dhamar Gusti <mail@khusika.com> Change-Id: I884e7f0d31c6c04a071cee0813db193595d2e829
khusika · Oct 9, 2019 · 49cbe7d · 49cbe7d
1 parent 2cee93a
commit 49cbe7d
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 616 deletions.
diff --git a/fs/exfat/Kconfig b/fs/exfat/Kconfig
@@ -35,10 +35,6 @@ config EXFAT_DEFAULT_IOCHARSET
 	  that most of your exFAT filesystems use, and can be overridden
 	  with the "iocharset" mount option for exFAT filesystems.
 
-config EXFAT_ALIGNED_MPAGE_WRITE
-	bool "Enable supporting aligned mpage_write"
-	default y
-
 config EXFAT_VIRTUAL_XATTR
 	bool "Virtual xattr support for exFAT"
 	default y

diff --git a/fs/exfat/Makefile b/fs/exfat/Makefile
@@ -7,7 +7,7 @@ ifneq ($(KERNELRELEASE),)
 obj-$(CONFIG_EXFAT_FS) += exfat.o
 
 exfat-objs	:= super.o core.o core_exfat.o api.o blkdev.o fatent.o cache.o \
-		   nls.o misc.o mpage.o extent.o xattr.o
+		   nls.o misc.o extent.o xattr.o
 else
 # Called from external kernel module build
 

diff --git a/fs/exfat/config.h b/fs/exfat/config.h
@@ -40,10 +40,6 @@
 #define CONFIG_EXFAT_DEFAULT_IOCHARSET  "utf8"
 #endif
 
-#ifndef CONFIG_EXFAT_ALIGNED_MPAGE_WRITE
-#define CONFIG_EXFAT_ALIGNED_MPAGE_WRITE
-#endif
-
 #ifndef CONFIG_EXFAT_FAT_MIRRORING /* if Kconfig lacked fat-mirroring option */
 #define CONFIG_EXFAT_FAT_MIRRORING /* Write FAT 1, FAT 2 simultaneously */
 #endif

diff --git a/fs/exfat/exfat.h b/fs/exfat/exfat.h
@@ -126,7 +126,6 @@ struct exfat_mount_options {
 	unsigned char symlink;      /* support symlink operation */
 	unsigned char errors;       /* on error: continue, panic, remount-ro */
 	unsigned char discard;      /* flag on if -o dicard specified and device support discard() */
-	unsigned short adj_req;     /* support aligned mpage write */
 	unsigned char delayed_meta; /* delay flushing dirty metadata */
 };
 
@@ -270,12 +269,6 @@ s32  nls_uni16s_to_vfsname(struct super_block *sb, UNI_NAME_T *uniname, u8 *p_cs
 s32  nls_vfsname_to_uni16s(struct super_block *sb, const u8 *p_cstring,
 			const s32 len, UNI_NAME_T *uniname, s32 *p_lossy);
 
-/* exfat/mpage.c */
-#ifdef CONFIG_EXFAT_ALIGNED_MPAGE_WRITE
-int exfat_mpage_writepages(struct address_space *mapping,
-			struct writeback_control *wbc, get_block_t *get_block);
-#endif
-
 /* exfat/xattr.c */
 #ifdef CONFIG_EXFAT_VIRTUAL_XATTR
 void setup_exfat_xattr_handler(struct super_block *sb);