summaryrefslogtreecommitdiff
path: root/fs/f2fs
diff options
context:
space:
mode:
authorJaegeuk Kim <jaegeuk@kernel.org>2016-06-13 18:27:02 -0700
committerJaegeuk Kim <jaegeuk@kernel.org>2016-07-06 10:44:07 -0700
commit67c3758d2267de589ee9a8856fe637cce85993d9 (patch)
tree472822e307b67d50f851020a8ae04118cbefcbc4 /fs/f2fs
parent3e19886eda963f0c1438b2d1a40334d421cd09a2 (diff)
f2fs: call update_inode_page for orphan inodes
Let's store orphan inode pages right away. Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Diffstat (limited to 'fs/f2fs')
-rw-r--r--fs/f2fs/checkpoint.c6
-rw-r--r--fs/f2fs/dir.c2
-rw-r--r--fs/f2fs/f2fs.h2
-rw-r--r--fs/f2fs/inode.c4
-rw-r--r--fs/f2fs/namei.c4
-rw-r--r--fs/f2fs/super.c16
6 files changed, 9 insertions, 25 deletions
diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c
index 837e6bcad5ce..8534b98c0712 100644
--- 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 72a0207f56a1..7ba52a04e13a 100644
--- 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 cee4a77a0f0a..bbcd4688f97b 100644
--- 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 63c432673c71..9221ca22720c 100644
--- 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 618829e8049c..4460400133cf 100644
--- 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 edc736de8ee9..41347c0829cd 100644
--- 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);
}
/*