f2fs: call update_inode_page for orphan inodes

Let's store orphan inode pages right away.

Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c
index 837e6bcad5cea425b76581c26c849bb4f8c99871..8534b98c07122e8c464995661c21843766f8b3c6 100644 (file)
--- a/fs/f2fs/checkpoint.c
+++ b/fs/f2fs/checkpoint.c
@@ -508,10 +508,11 @@ void release_orphan_inode(struct f2fs_sb_info *sbi)
        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)
@@ -535,7 +536,6 @@ static int recover_orphan_inode(struct f2fs_sb_info *sbi, nid_t ino)
        }
 
        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 72a0207f56a1a6af4957bcf89e0dc5355a1a3bd1..7ba52a04e13a3d641412dcfe0b898fa0c3dfb67e 100644 (file)
--- a/fs/f2fs/dir.c
+++ b/fs/f2fs/dir.c
@@ -666,7 +666,7 @@ void f2fs_drop_nlink(struct inode *dir, struct inode *inode)
        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 cee4a77a0f0afaaaed06c45b2dccc5bb206b53d8..bbcd4688f97b6c046b027d08f014e039a83ae927 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -2040,7 +2040,7 @@ bool exist_written_data(struct f2fs_sb_info *, nid_t, int);
 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 63c432673c71f37659d092411473a32a9489c858..9221ca22720c644f7457cb215145214a1a6af4f7 100644 (file)
--- a/fs/f2fs/inode.c
+++ b/fs/f2fs/inode.c
@@ -393,8 +393,6 @@ no_delete:
                !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));
        clear_inode(inode);
 }
 
@@ -421,7 +419,7 @@ void handle_failed_inode(struct inode *inode)
                        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 618829e8049c09de846972a5438e92fca19dbcc9..4460400133cfda1117bc9f82546079b9fd011c49 100644 (file)
--- a/fs/f2fs/namei.c
+++ b/fs/f2fs/namei.c
@@ -598,7 +598,7 @@ static int __f2fs_tmpfile(struct inode *dir, struct dentry *dentry,
         * add this non-linked tmpfile to orphan list, in this way we could
         * remove all unused data of tmpfile after abnormal power-off.
         */
-       add_orphan_inode(sbi, inode->i_ino);
+       add_orphan_inode(inode);
        alloc_nid_done(sbi, inode->i_ino);
 
        if (whiteout) {
@@ -712,7 +712,7 @@ static int f2fs_rename(struct inode *old_dir, struct dentry *old_dentry,
                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 edc736de8ee950460e9fb0eeb83a8c44c674ca5e..41347c0829cd379f61a07972ba672b9fe50bcad0 100644 (file)
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -585,8 +585,6 @@ static struct inode *f2fs_alloc_inode(struct super_block *sb)
 
 static int f2fs_drop_inode(struct inode *inode)
 {
-       int ret;
-
        /*
         * This is to avoid a deadlock condition like below.
         * writeback_single_inode(inode)
@@ -622,19 +620,7 @@ static int f2fs_drop_inode(struct inode *inode)
                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);
 }
 
 /*