From: Paul Spooren Date: Mon, 5 Oct 2020 23:54:43 +0000 (-1000) Subject: kernel: clean up XATTR config symbols X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=0f5b5cf730167e851f8289f41bf9af435b6013ab;p=openwrt%2Fstaging%2Fblocktrron.git kernel: clean up XATTR config symbols Extended attributes are required for overlayfs and have hence been long ago enabled for jffs2, but should be enabled unconditionally for all other filesystems which may potentially serve as overlayfs' upper directory. Previously it was inconsistently added in multiple targets. Add symbols to generic kernel config and remove all *_XATTR symbols from target configs. Signed-off-by: Paul Spooren [keep things as they are for squashfs, improve commit message] Signed-off-by: Daniel Golle --- diff --git a/target/linux/apm821xx/sata/config-default b/target/linux/apm821xx/sata/config-default index a93466a52e..daa4646bff 100644 --- a/target/linux/apm821xx/sata/config-default +++ b/target/linux/apm821xx/sata/config-default @@ -18,7 +18,6 @@ CONFIG_EXT4_FS=y # CONFIG_F2FS_CHECK_FS is not set CONFIG_F2FS_FS=y # CONFIG_F2FS_FS_SECURITY is not set -CONFIG_F2FS_FS_XATTR=y CONFIG_F2FS_STAT_FS=y CONFIG_SCSI=y CONFIG_BLK_DEV_SD=y diff --git a/target/linux/armvirt/config-5.4 b/target/linux/armvirt/config-5.4 index 4842825a1e..ec2c232cc2 100644 --- a/target/linux/armvirt/config-5.4 +++ b/target/linux/armvirt/config-5.4 @@ -71,7 +71,6 @@ CONFIG_EXT4_FS=y # CONFIG_F2FS_CHECK_FS is not set CONFIG_F2FS_FS=y # CONFIG_F2FS_FS_SECURITY is not set -CONFIG_F2FS_FS_XATTR=y CONFIG_F2FS_STAT_FS=y CONFIG_FAILOVER=y CONFIG_FIX_EARLYCON_MEM=y diff --git a/target/linux/bcm27xx/bcm2708/config-5.4 b/target/linux/bcm27xx/bcm2708/config-5.4 index ccc2b69556..3c4dc98eb0 100644 --- a/target/linux/bcm27xx/bcm2708/config-5.4 +++ b/target/linux/bcm27xx/bcm2708/config-5.4 @@ -159,7 +159,6 @@ CONFIG_EXT4_FS=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y CONFIG_F2FS_FS=y -CONFIG_F2FS_FS_XATTR=y CONFIG_F2FS_STAT_FS=y CONFIG_FB=y CONFIG_FB_BCM2708=y diff --git a/target/linux/bcm27xx/bcm2709/config-5.4 b/target/linux/bcm27xx/bcm2709/config-5.4 index ce873e213d..f76f3aae71 100644 --- a/target/linux/bcm27xx/bcm2709/config-5.4 +++ b/target/linux/bcm27xx/bcm2709/config-5.4 @@ -205,7 +205,6 @@ CONFIG_EXT4_FS=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y CONFIG_F2FS_FS=y -CONFIG_F2FS_FS_XATTR=y CONFIG_F2FS_STAT_FS=y CONFIG_FB=y CONFIG_FB_BCM2708=y diff --git a/target/linux/bcm27xx/bcm2710/config-5.4 b/target/linux/bcm27xx/bcm2710/config-5.4 index a0dcc9bb46..68ef51ca6f 100644 --- a/target/linux/bcm27xx/bcm2710/config-5.4 +++ b/target/linux/bcm27xx/bcm2710/config-5.4 @@ -248,7 +248,6 @@ CONFIG_EXT4_FS=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y CONFIG_F2FS_FS=y -CONFIG_F2FS_FS_XATTR=y CONFIG_F2FS_STAT_FS=y CONFIG_FB=y CONFIG_FB_BCM2708=y diff --git a/target/linux/bcm27xx/bcm2711/config-5.4 b/target/linux/bcm27xx/bcm2711/config-5.4 index abaaef5549..5561051e97 100644 --- a/target/linux/bcm27xx/bcm2711/config-5.4 +++ b/target/linux/bcm27xx/bcm2711/config-5.4 @@ -253,7 +253,6 @@ CONFIG_EXT4_FS=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y CONFIG_F2FS_FS=y -CONFIG_F2FS_FS_XATTR=y CONFIG_F2FS_STAT_FS=y CONFIG_FB=y CONFIG_FB_BCM2708=y diff --git a/target/linux/generic/config-5.4 b/target/linux/generic/config-5.4 index 5938137bda..7bfc4e56f5 100644 --- a/target/linux/generic/config-5.4 +++ b/target/linux/generic/config-5.4 @@ -836,7 +836,7 @@ CONFIG_CIFS_POSIX=y CONFIG_CIFS_STATS=y # CONFIG_CIFS_STATS2 is not set # CONFIG_CIFS_WEAK_PW_HASH is not set -# CONFIG_CIFS_XATTR is not set +CONFIG_CIFS_XATTR=y # CONFIG_CIO_DAC is not set CONFIG_CLANG_VERSION=0 # CONFIG_CLEANCACHE is not set @@ -1491,7 +1491,7 @@ CONFIG_EXPERT=y CONFIG_EXPORTFS=y # CONFIG_EXPORTFS_BLOCK_OPS is not set # CONFIG_EXT2_FS is not set -# CONFIG_EXT2_FS_XATTR is not set +CONFIG_EXT2_FS_XATTR=y # CONFIG_EXT3_FS is not set # CONFIG_EXT4_DEBUG is not set # CONFIG_EXT4_ENCRYPTION is not set @@ -4287,7 +4287,7 @@ CONFIG_RCU_TORTURE_TEST_SLOW_INIT_DELAY=3 # CONFIG_REISERFS_FS is not set # CONFIG_REISERFS_FS_POSIX_ACL is not set # CONFIG_REISERFS_FS_SECURITY is not set -# CONFIG_REISERFS_FS_XATTR is not set +CONFIG_REISERFS_FS_XATTR=y # CONFIG_REISERFS_PROC_INFO is not set # CONFIG_RELAY is not set # CONFIG_RELOCATABLE is not set @@ -5818,7 +5818,7 @@ CONFIG_TTY=y # CONFIG_UBIFS_FS_AUTHENTICATION is not set # CONFIG_UBIFS_FS_ENCRYPTION is not set # CONFIG_UBIFS_FS_SECURITY is not set -# CONFIG_UBIFS_FS_XATTR is not set +CONFIG_UBIFS_FS_XATTR=y # CONFIG_UBSAN is not set CONFIG_UBSAN_ALIGNMENT=y # CONFIG_UCB1400_CORE is not set diff --git a/target/linux/imx6/config-5.4 b/target/linux/imx6/config-5.4 index fa397829f2..248dd1a1ef 100644 --- a/target/linux/imx6/config-5.4 +++ b/target/linux/imx6/config-5.4 @@ -195,7 +195,6 @@ CONFIG_EXTCON=y CONFIG_EXTRA_FIRMWARE="imx/sdma/sdma-imx6q.bin" CONFIG_EXTRA_FIRMWARE_DIR="firmware" CONFIG_F2FS_FS=y -CONFIG_F2FS_FS_XATTR=y CONFIG_F2FS_STAT_FS=y CONFIG_FEC=y CONFIG_FIXED_PHY=y @@ -514,7 +513,6 @@ CONFIG_TREE_SRCU=y CONFIG_UBIFS_FS=y CONFIG_UBIFS_FS_ADVANCED_COMPR=y CONFIG_UBIFS_FS_LZO=y -CONFIG_UBIFS_FS_XATTR=y CONFIG_UBIFS_FS_ZLIB=y CONFIG_UBIFS_FS_ZSTD=y # CONFIG_UCLAMP_TASK is not set diff --git a/target/linux/layerscape/armv8_64b/config-5.4 b/target/linux/layerscape/armv8_64b/config-5.4 index 11d88cafe8..311f2eee84 100644 --- a/target/linux/layerscape/armv8_64b/config-5.4 +++ b/target/linux/layerscape/armv8_64b/config-5.4 @@ -258,7 +258,6 @@ CONFIG_ENETC_TSN=y CONFIG_EXT2_FS=y CONFIG_EXT2_FS_POSIX_ACL=y # CONFIG_EXT2_FS_SECURITY is not set -CONFIG_EXT2_FS_XATTR=y CONFIG_EXT3_FS=y CONFIG_EXT3_FS_POSIX_ACL=y # CONFIG_EXT3_FS_SECURITY is not set diff --git a/target/linux/malta/config-5.4 b/target/linux/malta/config-5.4 index 29566ee171..c440a366a6 100644 --- a/target/linux/malta/config-5.4 +++ b/target/linux/malta/config-5.4 @@ -97,7 +97,6 @@ CONFIG_EFI_EARLYCON=y CONFIG_ENABLE_MUST_CHECK=y CONFIG_EXT4_FS=y CONFIG_F2FS_FS=y -CONFIG_F2FS_FS_XATTR=y CONFIG_F2FS_STAT_FS=y CONFIG_FONT_8x16=y CONFIG_FONT_AUTOSELECT=y diff --git a/target/linux/mediatek/mt7623/config-5.4 b/target/linux/mediatek/mt7623/config-5.4 index dc93a65566..28760e6003 100644 --- a/target/linux/mediatek/mt7623/config-5.4 +++ b/target/linux/mediatek/mt7623/config-5.4 @@ -184,7 +184,6 @@ CONFIG_EINT_MTK=y CONFIG_ELF_CORE=y CONFIG_EXT4_FS=y CONFIG_F2FS_FS=y -CONFIG_F2FS_FS_XATTR=y CONFIG_F2FS_STAT_FS=y CONFIG_FIXED_PHY=y CONFIG_FIX_EARLYCON_MEM=y diff --git a/target/linux/mvebu/config-5.4 b/target/linux/mvebu/config-5.4 index a13cb8d9e5..60907b6b49 100644 --- a/target/linux/mvebu/config-5.4 +++ b/target/linux/mvebu/config-5.4 @@ -180,7 +180,6 @@ CONFIG_EDAC_SUPPORT=y CONFIG_EXT4_FS=y CONFIG_EXTCON=y CONFIG_F2FS_FS=y -CONFIG_F2FS_FS_XATTR=y CONFIG_F2FS_STAT_FS=y CONFIG_FIXED_PHY=y CONFIG_FIX_EARLYCON_MEM=y diff --git a/target/linux/octeon/config-5.4 b/target/linux/octeon/config-5.4 index 722a4c773e..efc872aee5 100644 --- a/target/linux/octeon/config-5.4 +++ b/target/linux/octeon/config-5.4 @@ -74,7 +74,6 @@ CONFIG_EFI_EARLYCON=y CONFIG_ENABLE_MUST_CHECK=y CONFIG_EXT4_FS=y CONFIG_F2FS_FS=y -CONFIG_F2FS_FS_XATTR=y CONFIG_F2FS_STAT_FS=y CONFIG_FAT_FS=y CONFIG_FIXED_PHY=y diff --git a/target/linux/octeontx/config-5.4 b/target/linux/octeontx/config-5.4 index 0b402e4de7..e732e76167 100644 --- a/target/linux/octeontx/config-5.4 +++ b/target/linux/octeontx/config-5.4 @@ -234,7 +234,6 @@ CONFIG_EFI_EARLYCON=y CONFIG_EXT4_FS=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_F2FS_FS=y -CONFIG_F2FS_FS_XATTR=y CONFIG_F2FS_STAT_FS=y CONFIG_FANOTIFY=y CONFIG_FAT_FS=y diff --git a/target/linux/omap/config-5.4 b/target/linux/omap/config-5.4 index 1a24943806..973cc2cec0 100644 --- a/target/linux/omap/config-5.4 +++ b/target/linux/omap/config-5.4 @@ -243,7 +243,6 @@ CONFIG_EXTCON=y CONFIG_EXTCON_PALMAS=y CONFIG_EXTCON_USB_GPIO=y CONFIG_F2FS_FS=y -CONFIG_F2FS_FS_XATTR=y CONFIG_F2FS_STAT_FS=y CONFIG_FANOTIFY=y CONFIG_FAT_FS=y diff --git a/target/linux/rockchip/armv8/config-5.4 b/target/linux/rockchip/armv8/config-5.4 index 794608d7e2..9508e8ba44 100644 --- a/target/linux/rockchip/armv8/config-5.4 +++ b/target/linux/rockchip/armv8/config-5.4 @@ -464,7 +464,6 @@ CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y CONFIG_THERMAL_GOV_STEP_WISE=y CONFIG_THERMAL_HWMON=y CONFIG_THERMAL_OF=y -# CONFIG_TMPFS_XATTR is not set CONFIG_TRACE_CLOCK=y CONFIG_TRANSPARENT_HUGEPAGE=y CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y diff --git a/target/linux/rockchip/config-default b/target/linux/rockchip/config-default index 1b2d5e1903..04b3a1326c 100644 --- a/target/linux/rockchip/config-default +++ b/target/linux/rockchip/config-default @@ -122,7 +122,6 @@ CONFIG_DTC=y CONFIG_EDAC_SUPPORT=y CONFIG_EFI_EARLYCON=y CONFIG_F2FS_FS=y -CONFIG_F2FS_FS_XATTR=y CONFIG_F2FS_STAT_FS=y CONFIG_FIX_EARLYCON_MEM=y CONFIG_FONT_8x16=y diff --git a/target/linux/sunxi/config-5.4 b/target/linux/sunxi/config-5.4 index 9b884d5cae..4634b647ef 100644 --- a/target/linux/sunxi/config-5.4 +++ b/target/linux/sunxi/config-5.4 @@ -172,7 +172,6 @@ CONFIG_ENABLE_MUST_CHECK=y CONFIG_EXT4_FS=y CONFIG_EXTCON=y CONFIG_F2FS_FS=y -CONFIG_F2FS_FS_XATTR=y CONFIG_F2FS_STAT_FS=y CONFIG_FAT_FS=y CONFIG_FB=y diff --git a/target/linux/tegra/config-5.4 b/target/linux/tegra/config-5.4 index e7722b9bc6..8733c50991 100644 --- a/target/linux/tegra/config-5.4 +++ b/target/linux/tegra/config-5.4 @@ -213,7 +213,6 @@ CONFIG_EXTCON=y # CONFIG_F2FS_CHECK_FS is not set CONFIG_F2FS_FS=y # CONFIG_F2FS_FS_SECURITY is not set -CONFIG_F2FS_FS_XATTR=y CONFIG_F2FS_STAT_FS=y CONFIG_FB=y CONFIG_FB_CFB_COPYAREA=y diff --git a/target/linux/uml/config/i386 b/target/linux/uml/config/i386 index 353d021cec..94a972792a 100644 --- a/target/linux/uml/config/i386 +++ b/target/linux/uml/config/i386 @@ -30,7 +30,6 @@ CONFIG_DNOTIFY=y # CONFIG_EARLY_PRINTK is not set CONFIG_EXT4_FS=y CONFIG_F2FS_FS=y -CONFIG_F2FS_FS_XATTR=y CONFIG_F2FS_STAT_FS=y CONFIG_FAILOVER=y CONFIG_FS_IOMAP=y diff --git a/target/linux/uml/config/x86_64 b/target/linux/uml/config/x86_64 index f5d59d2f28..988ef22faf 100644 --- a/target/linux/uml/config/x86_64 +++ b/target/linux/uml/config/x86_64 @@ -32,7 +32,6 @@ CONFIG_DNOTIFY=y # CONFIG_EARLY_PRINTK is not set CONFIG_EXT4_FS=y CONFIG_F2FS_FS=y -CONFIG_F2FS_FS_XATTR=y CONFIG_F2FS_STAT_FS=y CONFIG_FAILOVER=y CONFIG_FS_IOMAP=y diff --git a/target/linux/x86/config-5.4 b/target/linux/x86/config-5.4 index dbd23ce0f4..3dedc4087e 100644 --- a/target/linux/x86/config-5.4 +++ b/target/linux/x86/config-5.4 @@ -148,7 +148,6 @@ CONFIG_EXT4_FS=y # CONFIG_F2FS_CHECK_FS is not set CONFIG_F2FS_FS=y # CONFIG_F2FS_FS_SECURITY is not set -CONFIG_F2FS_FS_XATTR=y CONFIG_F2FS_STAT_FS=y # CONFIG_F71808E_WDT is not set CONFIG_FIRMWARE_MEMMAP=y diff --git a/target/linux/zynq/config-5.4 b/target/linux/zynq/config-5.4 index ccd2a75663..e027db2273 100644 --- a/target/linux/zynq/config-5.4 +++ b/target/linux/zynq/config-5.4 @@ -206,7 +206,6 @@ CONFIG_EXTCON=y # CONFIG_F2FS_CHECK_FS is not set CONFIG_F2FS_FS=y # CONFIG_F2FS_FS_SECURITY is not set -CONFIG_F2FS_FS_XATTR=y CONFIG_F2FS_STAT_FS=y CONFIG_FB=y CONFIG_FB_CFB_COPYAREA=y @@ -371,7 +370,6 @@ CONFIG_IRQ_WORK=y # CONFIG_ISDN is not set CONFIG_JBD2=y # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set -# CONFIG_JFFS2_FS_XATTR is not set CONFIG_JFFS2_ZLIB=y CONFIG_KERNEL_GZIP=y # CONFIG_KERNEL_MODE_NEON is not set @@ -589,7 +587,6 @@ CONFIG_THERMAL_OF=y CONFIG_TICK_CPU_ACCOUNTING=y CONFIG_TIMER_OF=y CONFIG_TIMER_PROBE=y -# CONFIG_TMPFS_XATTR is not set CONFIG_TREE_RCU=y CONFIG_TREE_SRCU=y CONFIG_UIO=y