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

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

f2fs: introduce f2fs_i_size_write with mark_inode_dirty_sync 



This patch introduces f2fs_i_size_write() to call mark_inode_dirty_sync() with
i_size_write().

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

fs/f2fs/data.c

+4 −6
Original line number Diff line number Diff line
@@ -564,7 +564,7 @@ struct page *get_new_data_page(struct inode *inode, 
got_it:

	if (new_i_size && i_size_read(inode) <

				((loff_t)(index + 1) << PAGE_SHIFT)) {

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

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

		/* Only the directory inode sets new_i_size */

		set_inode_flag(inode, FI_UPDATE_DIR);

	}
@@ -605,7 +605,7 @@ static int __allocate_data_block(struct dnode_of_data *dn) 
	fofs = start_bidx_of_node(ofs_of_node(dn->node_page), dn->inode) +

							dn->ofs_in_node;

	if (i_size_read(dn->inode) < ((loff_t)(fofs + 1) << PAGE_SHIFT))

		i_size_write(dn->inode,

		f2fs_i_size_write(dn->inode,

				((loff_t)(fofs + 1) << PAGE_SHIFT));

	return 0;

}
@@ -1711,10 +1711,8 @@ static int f2fs_write_end(struct file *file, 


	set_page_dirty(page);



	if (pos + copied > i_size_read(inode)) {

		i_size_write(inode, pos + copied);

		mark_inode_dirty(inode);

	}

	if (pos + copied > i_size_read(inode))

		f2fs_i_size_write(inode, pos + copied);



	f2fs_put_page(page, 1);

	f2fs_update_time(F2FS_I_SB(inode), REQ_TIME);

fs/f2fs/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -686,7 +686,7 @@ void f2fs_drop_nlink(struct inode *dir, struct inode *inode, struct page *page) 
	drop_nlink(inode);

	if (S_ISDIR(inode->i_mode)) {

		drop_nlink(inode);

		i_size_write(inode, 0);

		f2fs_i_size_write(inode, 0);

	}

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

	update_inode_page(inode);

fs/f2fs/f2fs.h

+9 −0
Original line number Diff line number Diff line
@@ -1556,6 +1556,15 @@ static inline void set_acl_inode(struct inode *inode, umode_t mode) 
	set_inode_flag(inode, FI_ACL_MODE);

}



static inline void f2fs_i_size_write(struct inode *inode, loff_t i_size)

{

	if (i_size_read(inode) == i_size)

		return;



	i_size_write(inode, i_size);

	mark_inode_dirty_sync(inode);

}



static inline void get_inline_info(struct inode *inode, struct f2fs_inode *ri)

{

	if (ri->i_inline & F2FS_INLINE_XATTR)

fs/f2fs/file.c

+4 −6
Original line number Diff line number Diff line
@@ -988,7 +988,7 @@ static int f2fs_collapse_range(struct inode *inode, loff_t offset, loff_t len) 


	ret = truncate_blocks(inode, new_size, true);

	if (!ret)

		i_size_write(inode, new_size);

		f2fs_i_size_write(inode, new_size);



	return ret;

}
@@ -1125,8 +1125,7 @@ static int f2fs_zero_range(struct inode *inode, loff_t offset, loff_t len, 


out:

	if (!(mode & FALLOC_FL_KEEP_SIZE) && i_size_read(inode) < new_size) {

		i_size_write(inode, new_size);

		mark_inode_dirty(inode);

		f2fs_i_size_write(inode, new_size);

		update_inode_page(inode);

	}
@@ -1186,7 +1185,7 @@ static int f2fs_insert_range(struct inode *inode, loff_t offset, loff_t len) 
	truncate_pagecache(inode, offset);



	if (!ret)

		i_size_write(inode, new_size);

		f2fs_i_size_write(inode, new_size);

	return ret;

}
@@ -1235,8 +1234,7 @@ static int expand_inode_data(struct inode *inode, loff_t offset, 
	}



	if (!(mode & FALLOC_FL_KEEP_SIZE) && i_size_read(inode) < new_size) {

		i_size_write(inode, new_size);

		mark_inode_dirty(inode);

		f2fs_i_size_write(inode, new_size);

		update_inode_page(inode);

	}

fs/f2fs/inline.c

+3 −3
Original line number Diff line number Diff line
@@ -340,7 +340,7 @@ int make_empty_inline_dir(struct inode *inode, struct inode *parent, 


	/* update i_size to MAX_INLINE_DATA */

	if (i_size_read(inode) < MAX_INLINE_DATA) {

		i_size_write(inode, MAX_INLINE_DATA);

		f2fs_i_size_write(inode, MAX_INLINE_DATA);

		set_inode_flag(inode, FI_UPDATE_DIR);

	}

	return 0;
@@ -402,7 +402,7 @@ static int f2fs_move_inline_dirents(struct inode *dir, struct page *ipage, 


	F2FS_I(dir)->i_current_depth = 1;

	if (i_size_read(dir) < PAGE_SIZE) {

		i_size_write(dir, PAGE_SIZE);

		f2fs_i_size_write(dir, PAGE_SIZE);

		set_inode_flag(dir, FI_UPDATE_DIR);

	}
@@ -493,7 +493,7 @@ static int f2fs_move_rehashed_dirents(struct inode *dir, struct page *ipage, 
	lock_page(ipage);

	memcpy(inline_dentry, backup_dentry, MAX_INLINE_DATA);

	F2FS_I(dir)->i_current_depth = 0;

	i_size_write(dir, MAX_INLINE_DATA);

	f2fs_i_size_write(dir, MAX_INLINE_DATA);

	update_inode(dir, ipage);

	f2fs_put_page(ipage, 1);