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

Commit fce5b710 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: Enable F2FS for 8909"

parents c587e989 fa1da3db

arch/arm/configs/msm8909-perf_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -505,6 +505,8 @@ CONFIG_TMPFS=y 
CONFIG_SDCARD_FS=y

CONFIG_UBIFS_FS=y

CONFIG_UBIFS_FS_ADVANCED_COMPR=y

CONFIG_F2FS_FS=y

CONFIG_F2FS_FS_SECURITY=y

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ASCII=y

CONFIG_NLS_ISO8859_1=y

arch/arm/configs/msm8909_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -521,6 +521,8 @@ CONFIG_TMPFS=y 
CONFIG_SDCARD_FS=y

CONFIG_UBIFS_FS=y

CONFIG_UBIFS_FS_ADVANCED_COMPR=y

CONFIG_F2FS_FS=y

CONFIG_F2FS_FS_SECURITY=y

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ASCII=y

CONFIG_NLS_ISO8859_1=y

fs/f2fs/data.c

+0 −9
Original line number Diff line number Diff line
@@ -1301,15 +1301,6 @@ next_page: 
	return 0;

}



static int get_data_block_bmap(struct inode *inode, sector_t iblock,

			struct buffer_head *bh_result, int create)

{

	/* Block number less than F2FS MAX BLOCKS */

	if (unlikely(iblock >= max_file_size(0)))

		return -EFBIG;

	return get_data_block_ro(inode, iblock, bh_result, create);

}



static int f2fs_read_data_page(struct file *file, struct page *page)

{

	struct inode *inode = page->mapping->host;