diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2016-10-08 18:00:01 +0300 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-10-08 18:00:01 +0300 |
| commit | f334bcd94b7d3c0fbc34d518a86548f451ab5faf (patch) | |
| tree | 357b0cbd488db581bc9bf710c3696579d21fac03 /fs/f2fs | |
| parent | 73e8fb2d596d5903cde6dcced39c0b88b5770a56 (diff) | |
| parent | 814184fd402557f3e5960db469157ccdf1fb69da (diff) | |
| download | linux-f334bcd94b7d3c0fbc34d518a86548f451ab5faf.tar.xz | |
Merge remote-tracking branch 'ovl/misc' into work.misc
Diffstat (limited to 'fs/f2fs')
| -rw-r--r-- | fs/f2fs/node.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c index f75d197d5beb..67ed2192f926 100644 --- a/fs/f2fs/node.c +++ b/fs/f2fs/node.c @@ -1513,7 +1513,7 @@ int wait_on_node_pages_writeback(struct f2fs_sb_info *sbi, nid_t ino) { pgoff_t index = 0, end = ULONG_MAX; struct pagevec pvec; - int ret2 = 0, ret = 0; + int ret2, ret = 0; pagevec_init(&pvec, 0); @@ -1542,10 +1542,7 @@ int wait_on_node_pages_writeback(struct f2fs_sb_info *sbi, nid_t ino) cond_resched(); } - if (unlikely(test_and_clear_bit(AS_ENOSPC, &NODE_MAPPING(sbi)->flags))) - ret2 = -ENOSPC; - if (unlikely(test_and_clear_bit(AS_EIO, &NODE_MAPPING(sbi)->flags))) - ret2 = -EIO; + ret2 = filemap_check_errors(NODE_MAPPING(sbi)); if (!ret) ret = ret2; return ret; |