diff options
| author | Jaegeuk Kim <jaegeuk@kernel.org> | 2016-09-13 00:08:37 +0200 |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2016-09-15 22:50:24 +0200 |
| commit | 5905f9afa27234f74423f7276d0833fed6a9a415 (patch) | |
| tree | 177d29668796af40d21c48a8f4fae7f9c8fe4110 /fs/f2fs | |
| parent | f2fs: remove dead code f2fs_check_acl (diff) | |
| download | linux-5905f9afa27234f74423f7276d0833fed6a9a415.tar.xz linux-5905f9afa27234f74423f7276d0833fed6a9a415.zip | |
f2fs: handle error in recover_orphan_inode
This patch enhances the error path in recover_orphan_inode.
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Diffstat (limited to 'fs/f2fs')
| -rw-r--r-- | fs/f2fs/checkpoint.c | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c index b80dd379b3be..df56a43f982e 100644 --- a/fs/f2fs/checkpoint.c +++ b/fs/f2fs/checkpoint.c @@ -531,8 +531,9 @@ void remove_orphan_inode(struct f2fs_sb_info *sbi, nid_t ino) static int recover_orphan_inode(struct f2fs_sb_info *sbi, nid_t ino) { struct inode *inode; + struct node_info ni; - inode = f2fs_iget(sbi->sb, ino); + inode = f2fs_iget_retry(sbi->sb, ino); if (IS_ERR(inode)) { /* * there should be a bug that we can't find the entry @@ -546,6 +547,22 @@ static int recover_orphan_inode(struct f2fs_sb_info *sbi, nid_t ino) /* truncate all the data during iput */ iput(inode); + + get_node_info(sbi, ino, &ni); + + /* ENOMEM was fully retried in f2fs_evict_inode. */ + if (ni.blk_addr != NULL_ADDR) { + int err = acquire_orphan_inode(sbi); + + if (err) { + set_sbi_flag(sbi, SBI_NEED_FSCK); + f2fs_msg(sbi->sb, KERN_WARNING, + "%s: orphan failed (ino=%x), run fsck to fix.", + __func__, ino); + return err; + } + __add_ino_entry(sbi, ino, ORPHAN_INO); + } return 0; } |