Unverified Commit 206e37b7 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!3828 openeuler_defconfig: enable erofs ondemand for x86 and arm64 

Merge Pull Request from: @ci-robot 
 
PR sync from: Baokun Li <libaokun1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/PIX3BPRYMSCFHMONWDJEOWZ6KVFORVNV/ 
 
https://gitee.com/openeuler/kernel/issues/I8RP48 
 
Link:https://gitee.com/openeuler/kernel/pulls/3828

 

Reviewed-by: default avatarHou Tao <houtao1@huawei.com>
Reviewed-by: default avatarLiu Chao <liuchao173@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents 86daf50f 196315b9

arch/arm64/configs/openeuler_defconfig

+8 −2
Original line number Diff line number Diff line
@@ -6880,7 +6880,7 @@ CONFIG_FSCACHE_STATS=y 
CONFIG_CACHEFILES=m

# CONFIG_CACHEFILES_DEBUG is not set

# CONFIG_CACHEFILES_ERROR_INJECTION is not set

# CONFIG_CACHEFILES_ONDEMAND is not set

CONFIG_CACHEFILES_ONDEMAND=y

# end of Caches



#
@@ -6987,7 +6987,13 @@ CONFIG_PSTORE_RAM=m 
# CONFIG_PSTORE_BLK is not set

# CONFIG_SYSV_FS is not set

# CONFIG_UFS_FS is not set

# CONFIG_EROFS_FS is not set

CONFIG_EROFS_FS=m

# CONFIG_EROFS_FS_DEBUG is not set

CONFIG_EROFS_FS_XATTR=y

CONFIG_EROFS_FS_POSIX_ACL=y

CONFIG_EROFS_FS_SECURITY=y

# CONFIG_EROFS_FS_ZIP is not set

CONFIG_EROFS_FS_ONDEMAND=y

CONFIG_NETWORK_FILESYSTEMS=y

CONFIG_NFS_FS=m

CONFIG_NFS_V2=m

arch/x86/configs/openeuler_defconfig

+8 −2
Original line number Diff line number Diff line
@@ -8074,7 +8074,7 @@ CONFIG_FSCACHE_STATS=y 
CONFIG_CACHEFILES=m

# CONFIG_CACHEFILES_DEBUG is not set

# CONFIG_CACHEFILES_ERROR_INJECTION is not set

# CONFIG_CACHEFILES_ONDEMAND is not set

CONFIG_CACHEFILES_ONDEMAND=y

# end of Caches



#
@@ -8184,7 +8184,13 @@ CONFIG_PSTORE_RAM=m 
# CONFIG_PSTORE_BLK is not set

# CONFIG_SYSV_FS is not set

# CONFIG_UFS_FS is not set

# CONFIG_EROFS_FS is not set

CONFIG_EROFS_FS=m

# CONFIG_EROFS_FS_DEBUG is not set

CONFIG_EROFS_FS_XATTR=y

CONFIG_EROFS_FS_POSIX_ACL=y

CONFIG_EROFS_FS_SECURITY=y

# CONFIG_EROFS_FS_ZIP is not set

CONFIG_EROFS_FS_ONDEMAND=y

CONFIG_NETWORK_FILESYSTEMS=y

CONFIG_NFS_FS=m

# CONFIG_NFS_V2 is not set