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

Commit 91942321 authored by Jaegeuk Kim's avatar Jaegeuk Kim
Browse files

f2fs: use inode pointer for {set, clear}_inode_flag 



This patch refactors to use inode pointer for set_inode_flag and
clear_inode_flag.

Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 1c4bf763

fs/f2fs/acl.c

+3 −4
Original line number Diff line number Diff line
@@ -201,7 +201,6 @@ struct posix_acl *f2fs_get_acl(struct inode *inode, int type) 
static int __f2fs_set_acl(struct inode *inode, int type,

			struct posix_acl *acl, struct page *ipage)

{

	struct f2fs_inode_info *fi = F2FS_I(inode);

	int name_index;

	void *value = NULL;

	size_t size = 0;
@@ -214,7 +213,7 @@ static int __f2fs_set_acl(struct inode *inode, int type, 
			error = posix_acl_equiv_mode(acl, &inode->i_mode);

			if (error < 0)

				return error;

			set_acl_inode(fi, inode->i_mode);

			set_acl_inode(inode, inode->i_mode);

			if (error == 0)

				acl = NULL;

		}
@@ -233,7 +232,7 @@ static int __f2fs_set_acl(struct inode *inode, int type, 
	if (acl) {

		value = f2fs_acl_to_disk(acl, &size);

		if (IS_ERR(value)) {

			clear_inode_flag(fi, FI_ACL_MODE);

			clear_inode_flag(inode, FI_ACL_MODE);

			return (int)PTR_ERR(value);

		}

	}
@@ -244,7 +243,7 @@ static int __f2fs_set_acl(struct inode *inode, int type, 
	if (!error)

		set_cached_acl(inode, type, acl);



	clear_inode_flag(fi, FI_ACL_MODE);

	clear_inode_flag(inode, FI_ACL_MODE);

	return error;

}

fs/f2fs/checkpoint.c

+6 −9
Original line number Diff line number Diff line
@@ -759,28 +759,25 @@ int get_valid_checkpoint(struct f2fs_sb_info *sbi) 
static void __add_dirty_inode(struct inode *inode, enum inode_type type)

{

	struct f2fs_sb_info *sbi = F2FS_I_SB(inode);

	struct f2fs_inode_info *fi = F2FS_I(inode);

	int flag = (type == DIR_INODE) ? FI_DIRTY_DIR : FI_DIRTY_FILE;



	if (is_inode_flag_set(fi, flag))

	if (is_inode_flag_set(inode, flag))

		return;



	set_inode_flag(fi, flag);

	list_add_tail(&fi->dirty_list, &sbi->inode_list[type]);

	set_inode_flag(inode, flag);

	list_add_tail(&F2FS_I(inode)->dirty_list, &sbi->inode_list[type]);

	stat_inc_dirty_inode(sbi, type);

}



static void __remove_dirty_inode(struct inode *inode, enum inode_type type)

{

	struct f2fs_inode_info *fi = F2FS_I(inode);

	int flag = (type == DIR_INODE) ? FI_DIRTY_DIR : FI_DIRTY_FILE;



	if (get_dirty_pages(inode) ||

			!is_inode_flag_set(F2FS_I(inode), flag))

	if (get_dirty_pages(inode) || !is_inode_flag_set(inode, flag))

		return;



	list_del_init(&fi->dirty_list);

	clear_inode_flag(fi, flag);

	list_del_init(&F2FS_I(inode)->dirty_list);

	clear_inode_flag(inode, flag);

	stat_dec_dirty_inode(F2FS_I_SB(inode), type);

}

fs/f2fs/data.c

+10 −11
Original line number Diff line number Diff line
@@ -321,7 +321,7 @@ int reserve_new_blocks(struct dnode_of_data *dn, blkcnt_t count) 
	if (!count)

		return 0;



	if (unlikely(is_inode_flag_set(F2FS_I(dn->inode), FI_NO_ALLOC)))

	if (unlikely(is_inode_flag_set(dn->inode, FI_NO_ALLOC)))

		return -EPERM;

	if (unlikely(!inc_valid_block_count(sbi, dn->inode, &count)))

		return -ENOSPC;
@@ -566,7 +566,7 @@ struct page *get_new_data_page(struct inode *inode, 
				((loff_t)(index + 1) << PAGE_SHIFT)) {

		i_size_write(inode, ((loff_t)(index + 1) << PAGE_SHIFT));

		/* Only the directory inode sets new_i_size */

		set_inode_flag(F2FS_I(inode), FI_UPDATE_DIR);

		set_inode_flag(inode, FI_UPDATE_DIR);

	}

	return page;

}
@@ -580,7 +580,7 @@ static int __allocate_data_block(struct dnode_of_data *dn) 
	pgoff_t fofs;

	blkcnt_t count = 1;



	if (unlikely(is_inode_flag_set(F2FS_I(dn->inode), FI_NO_ALLOC)))

	if (unlikely(is_inode_flag_set(dn->inode, FI_NO_ALLOC)))

		return -EPERM;



	dn->data_blkaddr = datablock_addr(dn->node_page, dn->ofs_in_node);
@@ -717,8 +717,7 @@ int f2fs_map_blocks(struct inode *inode, struct f2fs_map_blocks *map, 
			} else {

				err = __allocate_data_block(&dn);

				if (!err) {

					set_inode_flag(F2FS_I(inode),

							FI_APPEND_WRITE);

					set_inode_flag(inode, FI_APPEND_WRITE);

					allocated = true;

				}

			}
@@ -1193,14 +1192,14 @@ int do_write_data_page(struct f2fs_io_info *fio) 
			!IS_ATOMIC_WRITTEN_PAGE(page) &&

			need_inplace_update(inode))) {

		rewrite_data_page(fio);

		set_inode_flag(F2FS_I(inode), FI_UPDATE_WRITE);

		set_inode_flag(inode, FI_UPDATE_WRITE);

		trace_f2fs_do_write_data_page(page, IPU);

	} else {

		write_data_page(&dn, fio);

		trace_f2fs_do_write_data_page(page, OPU);

		set_inode_flag(F2FS_I(inode), FI_APPEND_WRITE);

		set_inode_flag(inode, FI_APPEND_WRITE);

		if (page->index == 0)

			set_inode_flag(F2FS_I(inode), FI_FIRST_BLOCK_WRITTEN);

			set_inode_flag(inode, FI_FIRST_BLOCK_WRITTEN);

	}

out_writepage:

	f2fs_put_dnode(&dn);
@@ -1469,7 +1468,7 @@ static int f2fs_write_data_pages(struct address_space *mapping, 
		goto skip_write;



	/* skip writing during file defragment */

	if (is_inode_flag_set(F2FS_I(inode), FI_DO_DEFRAG))

	if (is_inode_flag_set(inode, FI_DO_DEFRAG))

		goto skip_write;



	/* during POR, we don't need to trigger writepage at all. */
@@ -1549,7 +1548,7 @@ static int prepare_write_begin(struct f2fs_sb_info *sbi, 
	if (f2fs_has_inline_data(inode)) {

		if (pos + len <= MAX_INLINE_DATA) {

			read_inline_data(page, ipage);

			set_inode_flag(F2FS_I(inode), FI_DATA_EXIST);

			set_inode_flag(inode, FI_DATA_EXIST);

			if (inode->i_nlink)

				set_inline_node(ipage);

		} else {
@@ -1756,7 +1755,7 @@ static ssize_t f2fs_direct_IO(struct kiocb *iocb, struct iov_iter *iter) 
	err = blockdev_direct_IO(iocb, inode, iter, get_data_block_dio);

	if (iov_iter_rw(iter) == WRITE) {

		if (err > 0)

			set_inode_flag(F2FS_I(inode), FI_UPDATE_WRITE);

			set_inode_flag(inode, FI_UPDATE_WRITE);

		else if (err < 0)

			f2fs_write_failed(mapping, offset + count);

	}

fs/f2fs/dir.c

+11 −11
Original line number Diff line number Diff line
@@ -385,7 +385,7 @@ struct page *init_inode_metadata(struct inode *inode, struct inode *dir, 
	struct page *page;

	int err;



	if (is_inode_flag_set(F2FS_I(inode), FI_NEW_INODE)) {

	if (is_inode_flag_set(inode, FI_NEW_INODE)) {

		page = new_inode_page(inode);

		if (IS_ERR(page))

			return page;
@@ -429,7 +429,7 @@ struct page *init_inode_metadata(struct inode *inode, struct inode *dir, 
	 * This file should be checkpointed during fsync.

	 * We lost i_pino from now on.

	 */

	if (is_inode_flag_set(F2FS_I(inode), FI_INC_LINK)) {

	if (is_inode_flag_set(inode, FI_INC_LINK)) {

		file_lost_pino(inode);

		/*

		 * If link the tmpfile to alias through linkat path,
@@ -454,23 +454,23 @@ struct page *init_inode_metadata(struct inode *inode, struct inode *dir, 
void update_parent_metadata(struct inode *dir, struct inode *inode,

						unsigned int current_depth)

{

	if (inode && is_inode_flag_set(F2FS_I(inode), FI_NEW_INODE)) {

	if (inode && is_inode_flag_set(inode, FI_NEW_INODE)) {

		if (S_ISDIR(inode->i_mode)) {

			inc_nlink(dir);

			set_inode_flag(F2FS_I(dir), FI_UPDATE_DIR);

			set_inode_flag(dir, FI_UPDATE_DIR);

		}

		clear_inode_flag(F2FS_I(inode), FI_NEW_INODE);

		clear_inode_flag(inode, FI_NEW_INODE);

	}

	dir->i_mtime = dir->i_ctime = CURRENT_TIME;

	mark_inode_dirty(dir);



	if (F2FS_I(dir)->i_current_depth != current_depth) {

		F2FS_I(dir)->i_current_depth = current_depth;

		set_inode_flag(F2FS_I(dir), FI_UPDATE_DIR);

		set_inode_flag(dir, FI_UPDATE_DIR);

	}



	if (inode && is_inode_flag_set(F2FS_I(inode), FI_INC_LINK))

		clear_inode_flag(F2FS_I(inode), FI_INC_LINK);

	if (inode && is_inode_flag_set(inode, FI_INC_LINK))

		clear_inode_flag(inode, FI_INC_LINK);

}



int room_for_filename(const void *bitmap, int slots, int max_slots)
@@ -607,9 +607,9 @@ int f2fs_add_regular_entry(struct inode *dir, const struct qstr *new_name, 
	if (inode)

		up_write(&F2FS_I(inode)->i_sem);



	if (is_inode_flag_set(F2FS_I(dir), FI_UPDATE_DIR)) {

	if (is_inode_flag_set(dir, FI_UPDATE_DIR)) {

		update_inode_page(dir);

		clear_inode_flag(F2FS_I(dir), FI_UPDATE_DIR);

		clear_inode_flag(dir, FI_UPDATE_DIR);

	}

	kunmap(dentry_page);

	f2fs_put_page(dentry_page, 1);
@@ -661,7 +661,7 @@ int f2fs_do_tmpfile(struct inode *inode, struct inode *dir) 
	update_inode(inode, page);

	f2fs_put_page(page, 1);



	clear_inode_flag(F2FS_I(inode), FI_NEW_INODE);

	clear_inode_flag(inode, FI_NEW_INODE);

fail:

	up_write(&F2FS_I(inode)->i_sem);

	f2fs_update_time(F2FS_I_SB(inode), REQ_TIME);

fs/f2fs/extent_cache.c

+3 −3
Original line number Diff line number Diff line
@@ -431,7 +431,7 @@ static unsigned int f2fs_update_extent_tree_range(struct inode *inode, 


	write_lock(&et->lock);



	if (is_inode_flag_set(F2FS_I(inode), FI_NO_EXTENT)) {

	if (is_inode_flag_set(inode, FI_NO_EXTENT)) {

		write_unlock(&et->lock);

		return false;

	}
@@ -523,11 +523,11 @@ static unsigned int f2fs_update_extent_tree_range(struct inode *inode, 
				prev.len < F2FS_MIN_EXTENT_LEN &&

				et->largest.len < F2FS_MIN_EXTENT_LEN) {

			et->largest.len = 0;

			set_inode_flag(F2FS_I(inode), FI_NO_EXTENT);

			set_inode_flag(inode, FI_NO_EXTENT);

		}

	}



	if (is_inode_flag_set(F2FS_I(inode), FI_NO_EXTENT))

	if (is_inode_flag_set(inode, FI_NO_EXTENT))

		__free_extent_tree(sbi, et);



	write_unlock(&et->lock);