lkml.org 
[lkml]   [2017]   [Apr]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] f2fs: introduce valid_ipu_blkaddr to clean up
Date
This patch introduces valid_ipu_blkaddr to clean up checking block address for
inplace-update.

Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
---
fs/f2fs/data.c | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index b2992dbdd11e..c2b98e44c5f3 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -1331,8 +1331,6 @@ static int encrypt_one_page(struct f2fs_io_info *fio)

static inline bool need_inplace_update(struct f2fs_io_info *fio)
{
- if (fio->old_blkaddr == NEW_ADDR)
- return false;
if (is_cold_data(fio->page))
return false;
if (IS_ATOMIC_WRITTEN_PAGE(fio->page))
@@ -1341,6 +1339,15 @@ static inline bool need_inplace_update(struct f2fs_io_info *fio)
return need_inplace_update_policy(fio->page->mapping->host, fio);
}

+static inline bool valid_ipu_blkaddr(struct f2fs_io_info *fio)
+{
+ if (fio->old_blkaddr == NEW_ADDR)
+ return false;
+ if (fio->old_blkaddr == NULL_ADDR)
+ return false;
+ return true;
+}
+
int do_write_data_page(struct f2fs_io_info *fio)
{
struct page *page = fio->page;
@@ -1354,8 +1361,8 @@ int do_write_data_page(struct f2fs_io_info *fio)
if (need_inplace_update(fio) &&
f2fs_lookup_extent_cache(inode, page->index, &ei)) {
fio->old_blkaddr = ei.blk + page->index - ei.fofs;
- if (fio->old_blkaddr != NULL_ADDR &&
- fio->old_blkaddr != NEW_ADDR) {
+
+ if (valid_ipu_blkaddr(fio)) {
ipu_force = true;
goto got_it;
}
@@ -1382,7 +1389,7 @@ int do_write_data_page(struct f2fs_io_info *fio)
* If current allocation needs SSR,
* it had better in-place writes for updated data.
*/
- if (ipu_force || need_inplace_update(fio)) {
+ if (ipu_force || (valid_ipu_blkaddr(fio) && need_inplace_update(fio))) {
f2fs_bug_on(fio->sbi, fio->cp_rwsem_locked);
f2fs_put_dnode(&dn);
err = rewrite_data_page(fio);
--
2.11.0
\
 
 \ /
  Last update: 2017-04-25 23:49    [W:0.029 / U:0.604 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site