diff options
author | Jaegeuk Kim <jaegeuk.kim@samsung.com> | 2013-01-24 05:56:11 -0500 |
---|---|---|
committer | Jaegeuk Kim <jaegeuk.kim@samsung.com> | 2013-02-11 17:15:00 -0500 |
commit | 577e349514452fa3fcd99fd06e587b02d3d1cf28 (patch) | |
tree | fe4e86d3f56b8050c85b1f5fb76117d6e99c5aa9 /fs/f2fs/checkpoint.c | |
parent | 7d79e75f6420fc13cfe72554b3ea5afad24c8625 (diff) |
f2fs: prevent checkpoint once any IO failure is detected
This patch enhances the checkpoint routine to cope with IO errors.
Basically f2fs detects IO errors from end_io_write, and the errors are able to
be occurred during one of data, node, and meta page writes.
In the previous code, when an IO error is occurred during writes, f2fs sets a
flag, CP_ERROR_FLAG, in the raw ckeckpoint buffer which will be written to disk.
Afterwards, write_checkpoint() will check the flag and remount f2fs as a
read-only (ro) mode.
However, even once f2fs is remounted as a ro mode, dirty checkpoint pages are
freely able to be written to disk by flusher or kswapd in background.
In such a case, after cold reboot, f2fs would restore the checkpoint data having
CP_ERROR_FLAG, resulting in disabling write_checkpoint and remounting f2fs as
a ro mode again.
Therefore, let's prevent any checkpoint page (meta) writes once an IO error is
occurred, and remount f2fs as a ro mode right away at that moment.
Reported-by: Oliver Winker <oliver@oli1170.net>
Signed-off-by: Jaegeuk Kim <jaegeuk.kim@samsung.com>
Reviewed-by: Namjae Jeon <namjae.jeon@samsung.com>
Diffstat (limited to 'fs/f2fs/checkpoint.c')
-rw-r--r-- | fs/f2fs/checkpoint.c | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c index ff3c8439af87..9c1627165039 100644 --- a/fs/f2fs/checkpoint.c +++ b/fs/f2fs/checkpoint.c | |||
@@ -72,22 +72,22 @@ static int f2fs_write_meta_page(struct page *page, | |||
72 | { | 72 | { |
73 | struct inode *inode = page->mapping->host; | 73 | struct inode *inode = page->mapping->host; |
74 | struct f2fs_sb_info *sbi = F2FS_SB(inode->i_sb); | 74 | struct f2fs_sb_info *sbi = F2FS_SB(inode->i_sb); |
75 | int err; | ||
76 | 75 | ||
77 | wait_on_page_writeback(page); | 76 | /* Should not write any meta pages, if any IO error was occurred */ |
78 | 77 | if (wbc->for_reclaim || | |
79 | err = write_meta_page(sbi, page, wbc); | 78 | is_set_ckpt_flags(F2FS_CKPT(sbi), CP_ERROR_FLAG)) { |
80 | if (err) { | 79 | dec_page_count(sbi, F2FS_DIRTY_META); |
81 | wbc->pages_skipped++; | 80 | wbc->pages_skipped++; |
82 | set_page_dirty(page); | 81 | set_page_dirty(page); |
82 | return AOP_WRITEPAGE_ACTIVATE; | ||
83 | } | 83 | } |
84 | 84 | ||
85 | dec_page_count(sbi, F2FS_DIRTY_META); | 85 | wait_on_page_writeback(page); |
86 | 86 | ||
87 | /* In this case, we should not unlock this page */ | 87 | write_meta_page(sbi, page); |
88 | if (err != AOP_WRITEPAGE_ACTIVATE) | 88 | dec_page_count(sbi, F2FS_DIRTY_META); |
89 | unlock_page(page); | 89 | unlock_page(page); |
90 | return err; | 90 | return 0; |
91 | } | 91 | } |
92 | 92 | ||
93 | static int f2fs_write_meta_pages(struct address_space *mapping, | 93 | static int f2fs_write_meta_pages(struct address_space *mapping, |
@@ -138,7 +138,10 @@ long sync_meta_pages(struct f2fs_sb_info *sbi, enum page_type type, | |||
138 | BUG_ON(page->mapping != mapping); | 138 | BUG_ON(page->mapping != mapping); |
139 | BUG_ON(!PageDirty(page)); | 139 | BUG_ON(!PageDirty(page)); |
140 | clear_page_dirty_for_io(page); | 140 | clear_page_dirty_for_io(page); |
141 | f2fs_write_meta_page(page, &wbc); | 141 | if (f2fs_write_meta_page(page, &wbc)) { |
142 | unlock_page(page); | ||
143 | break; | ||
144 | } | ||
142 | if (nwritten++ >= nr_to_write) | 145 | if (nwritten++ >= nr_to_write) |
143 | break; | 146 | break; |
144 | } | 147 | } |
@@ -717,13 +720,12 @@ static void do_checkpoint(struct f2fs_sb_info *sbi, bool is_umount) | |||
717 | sbi->alloc_valid_block_count = 0; | 720 | sbi->alloc_valid_block_count = 0; |
718 | 721 | ||
719 | /* Here, we only have one bio having CP pack */ | 722 | /* Here, we only have one bio having CP pack */ |
720 | if (is_set_ckpt_flags(ckpt, CP_ERROR_FLAG)) | 723 | sync_meta_pages(sbi, META_FLUSH, LONG_MAX); |
721 | sbi->sb->s_flags |= MS_RDONLY; | ||
722 | else | ||
723 | sync_meta_pages(sbi, META_FLUSH, LONG_MAX); | ||
724 | 724 | ||
725 | clear_prefree_segments(sbi); | 725 | if (!is_set_ckpt_flags(ckpt, CP_ERROR_FLAG)) { |
726 | F2FS_RESET_SB_DIRT(sbi); | 726 | clear_prefree_segments(sbi); |
727 | F2FS_RESET_SB_DIRT(sbi); | ||
728 | } | ||
727 | } | 729 | } |
728 | 730 | ||
729 | /* | 731 | /* |