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

Commit 20b4ec1c authored by Blagovest Kolenichev's avatar Blagovest Kolenichev
Browse files

Revert "f2fs: clean up with is_valid_blkaddr()" 



This reverts commit a9a6eb48.

This is a preparation change for merging android-4.14 commit
73421a43 into msm-4.14 branch.
The reverted change is committed already as:

9e6c4a85 f2fs: clean up with is_valid_blkaddr()

Conflicts:
	fs/f2fs/checkpoint.c
	fs/f2fs/data.c
	fs/f2fs/f2fs.h
	fs/f2fs/recovery.c

Change-Id: Icffba5adb8e117081b6e34f9a2a89b3c5f1651aa
Signed-off-by: default avatarBlagovest Kolenichev <bkolenichev@codeaurora.org>
parent 091141ba

fs/f2fs/checkpoint.c

+2 −2
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ struct page *f2fs_get_tmp_page(struct f2fs_sb_info *sbi, pgoff_t index) 
	return __get_meta_page(sbi, index, false);

}



bool f2fs_is_valid_meta_blkaddr(struct f2fs_sb_info *sbi,

bool f2fs_is_valid_blkaddr(struct f2fs_sb_info *sbi,

					block_t blkaddr, int type)

{

	switch (type) {
@@ -176,7 +176,7 @@ int f2fs_ra_meta_pages(struct f2fs_sb_info *sbi, block_t start, int nrpages, 
	blk_start_plug(&plug);

	for (; nrpages-- > 0; blkno++) {



		if (!f2fs_is_valid_meta_blkaddr(sbi, blkno, type))

		if (!f2fs_is_valid_blkaddr(sbi, blkno, type))

			goto out;



		switch (type) {

fs/f2fs/data.c

+13 −5
Original line number Diff line number Diff line
@@ -486,7 +486,7 @@ void f2fs_submit_page_write(struct f2fs_io_info *fio) 
		spin_unlock(&io->io_lock);

	}



	if (is_valid_blkaddr(fio->old_blkaddr))

	if (fio->old_blkaddr != NEW_ADDR)

		verify_block_addr(fio, fio->old_blkaddr);

	verify_block_addr(fio, fio->new_blkaddr);
@@ -1046,7 +1046,7 @@ int f2fs_map_blocks(struct inode *inode, struct f2fs_map_blocks *map, 
next_block:

	blkaddr = datablock_addr(dn.inode, dn.node_page, dn.ofs_in_node);



	if (!is_valid_blkaddr(blkaddr)) {

	if (blkaddr == NEW_ADDR || blkaddr == NULL_ADDR) {

		if (create) {

			if (unlikely(f2fs_cp_error(sbi))) {

				err = -EIO;
@@ -1681,6 +1681,15 @@ static inline bool need_inplace_update(struct f2fs_io_info *fio) 
	return f2fs_should_update_inplace(inode, fio);

}



static inline bool valid_ipu_blkaddr(struct f2fs_io_info *fio)

{

	if (fio->old_blkaddr == NEW_ADDR)

		return false;

	if (fio->old_blkaddr == NULL_ADDR)

		return false;

	return true;

}



int f2fs_do_write_data_page(struct f2fs_io_info *fio)

{

	struct page *page = fio->page;
@@ -1695,7 +1704,7 @@ int f2fs_do_write_data_page(struct f2fs_io_info *fio) 
			f2fs_lookup_extent_cache(inode, page->index, &ei)) {

		fio->old_blkaddr = ei.blk + page->index - ei.fofs;



		if (is_valid_blkaddr(fio->old_blkaddr)) {

		if (valid_ipu_blkaddr(fio)) {

			ipu_force = true;

			fio->need_lock = LOCK_DONE;

			goto got_it;
@@ -1722,8 +1731,7 @@ int f2fs_do_write_data_page(struct f2fs_io_info *fio) 
	 * If current allocation needs SSR,

	 * it had better in-place writes for updated data.

	 */

	if (ipu_force || (is_valid_blkaddr(fio->old_blkaddr) &&

					need_inplace_update(fio))) {

	if (ipu_force || (valid_ipu_blkaddr(fio) && need_inplace_update(fio))) {

		err = encrypt_one_page(fio);

		if (err)

			goto out_writepage;

fs/f2fs/f2fs.h

+1 −8
Original line number Diff line number Diff line
@@ -2666,13 +2666,6 @@ static inline void f2fs_update_iostat(struct f2fs_sb_info *sbi, 
	spin_unlock(&sbi->iostat_lock);

}



static inline bool is_valid_blkaddr(block_t blkaddr)

{

	if (blkaddr == NEW_ADDR || blkaddr == NULL_ADDR)

		return false;

	return true;

}



/*

 * file.c

 */
@@ -2896,7 +2889,7 @@ void f2fs_stop_checkpoint(struct f2fs_sb_info *sbi, bool end_io); 
struct page *f2fs_grab_meta_page(struct f2fs_sb_info *sbi, pgoff_t index);

struct page *f2fs_get_meta_page(struct f2fs_sb_info *sbi, pgoff_t index);

struct page *f2fs_get_tmp_page(struct f2fs_sb_info *sbi, pgoff_t index);

bool f2fs_is_valid_meta_blkaddr(struct f2fs_sb_info *sbi,

bool f2fs_is_valid_blkaddr(struct f2fs_sb_info *sbi,

			block_t blkaddr, int type);

int f2fs_ra_meta_pages(struct f2fs_sb_info *sbi, block_t start, int nrpages,

			int type, bool sync);

fs/f2fs/file.c

+1 −1
Original line number Diff line number Diff line
@@ -356,7 +356,7 @@ static bool __found_offset(block_t blkaddr, pgoff_t dirty, pgoff_t pgofs, 
	switch (whence) {

	case SEEK_DATA:

		if ((blkaddr == NEW_ADDR && dirty == pgofs) ||

			is_valid_blkaddr(blkaddr))

			(blkaddr != NEW_ADDR && blkaddr != NULL_ADDR))

			return true;

		break;

	case SEEK_HOLE:

fs/f2fs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ static bool __written_first_block(struct f2fs_inode *ri) 
{

	block_t addr = le32_to_cpu(ri->i_addr[offset_in_addr(ri)]);



	if (is_valid_blkaddr(addr))

	if (addr != NEW_ADDR && addr != NULL_ADDR)

		return true;

	return false;

}