f2fs: introduce f2fs_i_links_write with mark_inode_dirty_sync
This patch introduces f2fs_i_links_write() to call mark_inode_dirty_sync() when
changing inode->i_links.
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Conflicts:
fs/f2fs/namei.c
diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c
index 120a791..0d36e4a 100644
--- a/fs/f2fs/checkpoint.c
+++ b/fs/f2fs/checkpoint.c
@@ -536,6 +536,7 @@
}
clear_nlink(inode);
+ mark_inode_dirty_sync(inode);
/* truncate all the data during iput */
iput(inode);
diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c
index 2866865..457cc6f 100644
--- a/fs/f2fs/dir.c
+++ b/fs/f2fs/dir.c
@@ -437,7 +437,7 @@
*/
if (inode->i_nlink == 0)
remove_orphan_inode(F2FS_I_SB(dir), inode->i_ino);
- inc_nlink(inode);
+ f2fs_i_links_write(inode, true);
}
return page;
@@ -456,7 +456,7 @@
{
if (inode && is_inode_flag_set(inode, FI_NEW_INODE)) {
if (S_ISDIR(inode->i_mode)) {
- inc_nlink(dir);
+ f2fs_i_links_write(dir, true);
set_inode_flag(dir, FI_UPDATE_DIR);
}
clear_inode_flag(inode, FI_NEW_INODE);
@@ -675,7 +675,7 @@
down_write(&F2FS_I(inode)->i_sem);
if (S_ISDIR(inode->i_mode)) {
- drop_nlink(dir);
+ f2fs_i_links_write(dir, false);
if (page)
update_inode(dir, page);
else
@@ -683,9 +683,9 @@
}
inode->i_ctime = CURRENT_TIME;
- drop_nlink(inode);
+ f2fs_i_links_write(inode, false);
if (S_ISDIR(inode->i_mode)) {
- drop_nlink(inode);
+ f2fs_i_links_write(inode, false);
f2fs_i_size_write(inode, 0);
}
up_write(&F2FS_I(inode)->i_sem);
diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 61569b5..964d558 100644
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -1584,6 +1584,15 @@
set_inode_flag(inode, FI_ACL_MODE);
}
+static inline void f2fs_i_links_write(struct inode *inode, bool inc)
+{
+ if (inc)
+ inc_nlink(inode);
+ else
+ drop_nlink(inode);
+ mark_inode_dirty_sync(inode);
+}
+
static inline void f2fs_i_blocks_write(struct inode *inode,
blkcnt_t diff, bool add)
{
diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c
index 07d5f3f..5e3c1d3 100644
--- a/fs/f2fs/namei.c
+++ b/fs/f2fs/namei.c
@@ -349,9 +349,6 @@
f2fs_delete_entry(de, page, dir, inode);
f2fs_unlock_op(sbi);
- /* In order to evict this inode, we set it dirty */
- mark_inode_dirty(inode);
-
if (IS_DIRSYNC(dir))
f2fs_sync_fs(sbi->sb, 1);
fail:
@@ -634,12 +631,10 @@
new_inode->i_ctime = CURRENT_TIME;
down_write(&F2FS_I(new_inode)->i_sem);
if (old_dir_entry)
- drop_nlink(new_inode);
- drop_nlink(new_inode);
+ f2fs_i_links_write(new_inode, false);
+ f2fs_i_links_write(new_inode, false);
up_write(&F2FS_I(new_inode)->i_sem);
- mark_inode_dirty(new_inode);
-
if (!new_inode->i_nlink)
add_orphan_inode(sbi, new_inode->i_ino);
else
@@ -659,7 +654,7 @@
}
if (old_dir_entry) {
- inc_nlink(new_dir);
+ f2fs_i_links_write(new_dir, true);
update_inode_page(new_dir);
}
@@ -704,8 +699,7 @@
f2fs_dentry_kunmap(old_inode, old_dir_page);
f2fs_put_page(old_dir_page, 0);
}
- drop_nlink(old_dir);
- mark_inode_dirty(old_dir);
+ f2fs_i_links_write(old_dir, false);
update_inode_page(old_dir);
}