f2fs: call update_inode_page for orphan inodes
Let's store orphan inode pages right away.
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Conflicts:
fs/f2fs/namei.c
Conflicts:
fs/f2fs/inode.c
diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c
index baf2f51..4f16f48 100644
--- a/fs/f2fs/checkpoint.c
+++ b/fs/f2fs/checkpoint.c
@@ -509,10 +509,11 @@
spin_unlock(&im->ino_lock);
}
-void add_orphan_inode(struct f2fs_sb_info *sbi, nid_t ino)
+void add_orphan_inode(struct inode *inode)
{
/* add new orphan ino entry into list */
- __add_ino_entry(sbi, ino, ORPHAN_INO);
+ __add_ino_entry(F2FS_I_SB(inode), inode->i_ino, ORPHAN_INO);
+ update_inode_page(inode);
}
void remove_orphan_inode(struct f2fs_sb_info *sbi, nid_t ino)
@@ -536,7 +537,6 @@
}
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 3a20b3e..99d9ac9 100644
--- a/fs/f2fs/dir.c
+++ b/fs/f2fs/dir.c
@@ -666,7 +666,7 @@
up_write(&F2FS_I(inode)->i_sem);
if (inode->i_nlink == 0)
- add_orphan_inode(sbi, inode->i_ino);
+ add_orphan_inode(inode);
else
release_orphan_inode(sbi);
}
diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index eb549f5..0b92170 100644
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -2083,7 +2083,7 @@
int f2fs_sync_inode_meta(struct f2fs_sb_info *);
int acquire_orphan_inode(struct f2fs_sb_info *);
void release_orphan_inode(struct f2fs_sb_info *);
-void add_orphan_inode(struct f2fs_sb_info *, nid_t);
+void add_orphan_inode(struct inode *);
void remove_orphan_inode(struct f2fs_sb_info *, nid_t);
int recover_orphan_inodes(struct f2fs_sb_info *);
int get_valid_checkpoint(struct f2fs_sb_info *);
diff --git a/fs/f2fs/inode.c b/fs/f2fs/inode.c
index a3c89b7..830a91d 100644
--- a/fs/f2fs/inode.c
+++ b/fs/f2fs/inode.c
@@ -390,7 +390,6 @@
!exist_written_data(sbi, inode->i_ino, ORPHAN_INO));
out_clear:
fscrypt_put_encryption_info(inode, NULL);
- f2fs_bug_on(sbi, is_inode_flag_set(inode, FI_DIRTY_INODE));
end_writeback(inode);
}
@@ -417,7 +416,7 @@
f2fs_msg(sbi->sb, KERN_WARNING,
"Too many orphan inodes, run fsck to fix.");
} else {
- add_orphan_inode(sbi, inode->i_ino);
+ add_orphan_inode(inode);
}
alloc_nid_done(sbi, inode->i_ino);
} else {
diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c
index 0a7a0d2..76b677a 100644
--- a/fs/f2fs/namei.c
+++ b/fs/f2fs/namei.c
@@ -642,7 +642,7 @@
up_write(&F2FS_I(new_inode)->i_sem);
if (!new_inode->i_nlink)
- add_orphan_inode(sbi, new_inode->i_ino);
+ add_orphan_inode(new_inode);
else
release_orphan_inode(sbi);
} else {
diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index afc06dd..5aca298 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -574,8 +574,6 @@
static int f2fs_drop_inode(struct inode *inode)
{
- int ret;
-
/*
* This is to avoid a deadlock condition like below.
* writeback_single_inode(inode)
@@ -608,19 +606,7 @@
return 0;
}
- ret = generic_drop_inode(inode);
- if (is_inode_flag_set(inode, FI_DIRTY_INODE)) {
- if (ret)
- inode->i_state |= I_WILL_FREE;
- spin_unlock(&inode->i_lock);
-
- update_inode_page(inode);
-
- spin_lock(&inode->i_lock);
- if (ret)
- inode->i_state &= ~I_WILL_FREE;
- }
- return ret;
+ return generic_drop_inode(inode);
}
/*