diff options
| author | Jaegeuk Kim <jaegeuk@kernel.org> | 2018-07-31 18:09:01 +0200 |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2018-08-11 01:19:05 +0200 |
| commit | 8d714f8aa34cf6a49b8d8d291ab01a59699604bd (patch) | |
| tree | d4e3d28b329e89eb155ed8baba0ee0945ad7ccbc /fs/f2fs | |
| parent | f2fs: fix to clear PG_checked flag in set_page_dirty() (diff) | |
| download | linux-8d714f8aa34cf6a49b8d8d291ab01a59699604bd.tar.xz linux-8d714f8aa34cf6a49b8d8d291ab01a59699604bd.zip | |
f2fs: avoid f2fs_bug_on() in cp_error case
There is a subtle race condition to invoke f2fs_bug_on() in shutdown tests. I've
confirmed that the last checkpoint is preserved in consistent state, so it'd be
fine to just return error at this moment.
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Diffstat (limited to 'fs/f2fs')
| -rw-r--r-- | fs/f2fs/node.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c index 6055d2d12640..21ffb784764c 100644 --- a/fs/f2fs/node.c +++ b/fs/f2fs/node.c @@ -1075,6 +1075,10 @@ int f2fs_remove_inode_page(struct inode *inode) f2fs_truncate_data_blocks_range(&dn, 1); /* 0 is possible, after f2fs_new_inode() has failed */ + if (unlikely(f2fs_cp_error(F2FS_I_SB(inode)))) { + f2fs_put_dnode(&dn); + return -EIO; + } f2fs_bug_on(F2FS_I_SB(inode), inode->i_blocks != 0 && inode->i_blocks != 8); |