diff options
| author | Chris Fries <C.Fries@motorola.com> | 2013-05-02 16:09:05 -0500 |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk.kim@samsung.com> | 2013-05-08 19:54:20 +0900 |
| commit | 047184b42b52376f4066f9ab357c0a61a12f116e (patch) | |
| tree | d00a81f57a7907527b2d3f45d69a290c07a290fb /fs | |
| parent | bde582b225e98fe9e35cd67e4cb4406a6f85ae3e (diff) | |
| download | op-kernel-dev-047184b42b52376f4066f9ab357c0a61a12f116e.zip op-kernel-dev-047184b42b52376f4066f9ab357c0a61a12f116e.tar.gz | |
f2fs: recover when journal contains deleted files
When recovering a journal file with fsync data for files that have
been deleted, don't bail out on recovery.
Signed-off-by: Chris Fries <C.Fries@motorola.com>
Reviewed-by: Russell Knize <rknize2@motorola.com>
Reviewed-by: Jason Hrycay <jason.hrycay@motorola.com>
[Jaegeuk Kim: fit the coding style]
Signed-off-by: Jaegeuk Kim <jaegeuk.kim@samsung.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/f2fs/recovery.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/fs/f2fs/recovery.c b/fs/f2fs/recovery.c index f16d12d..60c8a50 100644 --- a/fs/f2fs/recovery.c +++ b/fs/f2fs/recovery.c @@ -53,7 +53,7 @@ static int recover_dentry(struct page *ipage, struct inode *inode) dir = f2fs_iget(inode->i_sb, le32_to_cpu(raw_inode->i_pino)); if (IS_ERR(dir)) { - err = -EINVAL; + err = PTR_ERR(dir); goto out; } @@ -156,8 +156,12 @@ static int find_fsync_dnodes(struct f2fs_sb_info *sbi, struct list_head *head) } if (IS_INODE(page)) { err = recover_inode(entry->inode, page); - if (err) + if (err == -ENOENT) { + goto next; + } else if (err) { + err = -EINVAL; goto unlock_out; + } } next: /* check next segment */ |
