f2fs: split drop_inmem_pages from commit_inmem_pages
PATCH 1/2 f2fs: split drop_inmem_pages from commit_inmem_pages
Split drop_inmem_pages from commit_inmem_pages for code readability, and prepare for the following modification.
Signed-off-by Chao Yu <[email protected]>
--- fs/f2fs/f2fs.h | 3 +- fs/f2fs/file.c | 6 ++-- fs/f2fs/inode.c | 2 +- fs/f2fs/segment.c | 103 +++++++++++++++++++++++++++++++++--------------------- fs/f2fs/super.c | 2 +- 5 files changed, 70 insertions(+), 46 deletions(-)
fs/f2fs/f2fs.h +2 -1
@@ -1830,7 +1830,8 @@ void destroy_node_manager_caches(void);* segment.c */ void register_inmem_page (struct inode *,struct page *); -int commit_inmem_pages (struct inode *,bool ); +void drop_inmem_pages (struct inode *); +int commit_inmem_pages (struct inode *);void f2fs_balance_fs (struct f2fs_sb_info *,bool );void f2fs_balance_fs_bg (struct f2fs_sb_info *);int f2fs_issue_flush (struct f2fs_sb_info *);
fs/f2fs/file.c +3 -3
@@ -1252,7 +1252,7 @@ static int f2fs_release_file(struct inode *inode, struct file *filp) {/* some remained atomic pages should discarded */ if (f2fs_is_atomic_file (inode)) -commit_inmem_pages (inode, true); +drop_inmem_pages (inode);if (f2fs_is_volatile_file (inode)) {set_inode_flag (F2FS_I (inode),FI_DROP_CACHE );filemap_fdatawrite (inode->i_mapping);
@@ -1376,7 +1376,7 @@ static int f2fs_ioc_commit_atomic_write(struct file *filp)if (f2fs_is_atomic_file (inode)) {clear_inode_flag (F2FS_I (inode),FI_ATOMIC_FILE ); - ret =commit_inmem_pages (inode, false); + ret =commit_inmem_pages (inode);if (ret) {set_inode_flag (F2FS_I (inode),FI_ATOMIC_FILE ); goto err_out;
@@ -1439,7 +1439,7 @@ static int f2fs_ioc_abort_volatile_write(struct file *filp)if (f2fs_is_atomic_file (inode)) {clear_inode_flag (F2FS_I (inode),FI_ATOMIC_FILE ); -commit_inmem_pages (inode, true); +drop_inmem_pages (inode); }if (f2fs_is_volatile_file (inode)) {clear_inode_flag (F2FS_I (inode),FI_VOLATILE_FILE );
fs/f2fs/inode.c +1 -1
@@ -324,7 +324,7 @@ void f2fs_evict_inode(struct inode *inode)/* some remained atomic pages should discarded */ if (f2fs_is_atomic_file (inode)) -commit_inmem_pages (inode, true); +drop_inmem_pages (inode);trace_f2fs_evict_inode (inode);truncate_inode_pages_final (&inode->i_data);
fs/f2fs/segment.c +63 -40
133 lines not on this page · raw message
fs/f2fs/super.c +1 -1
@@ -494,7 +494,7 @@ static int f2fs_drop_inode(struct inode *inode)/* some remained atomic pages should discarded */ if (f2fs_is_atomic_file (inode)) -commit_inmem_pages (inode, true); +drop_inmem_pages (inode);/* should remain fi->extent_tree for writepage */ f2fs_destroy_extent_node (inode);
Signature · 1 line
2.7.0.2.g1b0b6dd