Skip to contentSkip to conversation

f2fs: split drop_inmem_pages from commit_inmem_pages

PATCH In review Chao Yu 1 participant 1 message Dec 29, 2015 F2FS file system

lore
Share & tools
lore

Chao Yu

author
#0 lore raw

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 | 101 ++++++++++++++++++++++++++++++++++--------------------
 fs/f2fs/super.c   |   2 +-
 5 files changed, 70 insertions(+), 44 deletions(-)
fs/f2fs/f2fs.h +2 -1
index 293dc4e..7fbfee9 100644
@@ -1781,7 +1781,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 *);
 void f2fs_balance_fs_bg(struct f2fs_sb_info *);
 int f2fs_issue_flush(struct f2fs_sb_info *);
fs/f2fs/file.c +3 -3
index 91f576a..cfe7f13 100644
@@ -1253,7 +1253,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);

@@ -1375,7 +1375,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)
 			goto err_out;
 	}

@@ -1435,7 +1435,7 @@ static int f2fs_ioc_abort_volatile_write(struct file *filp)
 
 	clear_inode_flag(F2FS_I(inode), FI_ATOMIC_FILE);
 	clear_inode_flag(F2FS_I(inode), FI_VOLATILE_FILE);
-	commit_inmem_pages(inode, true);
+	drop_inmem_pages(inode);
 
 	mnt_drop_write_file(filp);
 	return ret;
fs/f2fs/inode.c +1 -1
index e955008..9075c5e 100644
@@ -318,7 +318,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 -38

131 lines not on this page · raw message

fs/f2fs/super.c +1 -1
index 4a2e51e..f474355 100644
@@ -474,7 +474,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.6.3