diff options
author | Chao Yu <chao2.yu@samsung.com> | 2015-05-28 07:15:35 -0400 |
---|---|---|
committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2015-06-02 12:52:07 -0400 |
commit | 528e34593d6eff11a289ef23452c66175a340f0b (patch) | |
tree | ee116eb15e84ee2837207649a484c999d7a2c66f /fs/f2fs/file.c | |
parent | 96c6dd59bf1d8b30afd3681550b321f4183e1914 (diff) |
f2fs: hide common code in f2fs_replace_block
This patch clean up codes through:
1.rename f2fs_replace_block to __f2fs_replace_block().
2.introduce new f2fs_replace_block() to include __f2fs_replace_block()
and some common related codes around __f2fs_replace_block().
Then, newly introduced function f2fs_replace_block can be used by
following patch.
Signed-off-by: Chao Yu <chao2.yu@samsung.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Diffstat (limited to 'fs/f2fs/file.c')
-rw-r--r-- | fs/f2fs/file.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index 6b4ba7429dba..aec96d3f8222 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c | |||
@@ -854,18 +854,10 @@ static int f2fs_do_collapse(struct inode *inode, pgoff_t start, pgoff_t end) | |||
854 | set_data_blkaddr(&dn); | 854 | set_data_blkaddr(&dn); |
855 | } else if (new_addr != NEW_ADDR) { | 855 | } else if (new_addr != NEW_ADDR) { |
856 | struct node_info ni; | 856 | struct node_info ni; |
857 | struct f2fs_summary sum; | ||
858 | 857 | ||
859 | get_node_info(sbi, dn.nid, &ni); | 858 | get_node_info(sbi, dn.nid, &ni); |
860 | set_summary(&sum, dn.nid, dn.ofs_in_node, | 859 | f2fs_replace_block(sbi, &dn, old_addr, new_addr, |
861 | ni.version); | 860 | ni.version, true); |
862 | |||
863 | f2fs_replace_block(sbi, &sum, old_addr, | ||
864 | new_addr, true); | ||
865 | |||
866 | dn.data_blkaddr = new_addr; | ||
867 | set_data_blkaddr(&dn); | ||
868 | f2fs_update_extent_cache(&dn); | ||
869 | } | 861 | } |
870 | 862 | ||
871 | f2fs_put_dnode(&dn); | 863 | f2fs_put_dnode(&dn); |