diff options
author | Chao Yu <yuchao0@huawei.com> | 2016-09-19 23:04:18 -0400 |
---|---|---|
committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2016-09-30 20:34:20 -0400 |
commit | aaec2b1d18792a5f27b69ff37f34f43f89f5aa3b (patch) | |
tree | d21e6ad4e210ad826580c03a55cb97230543c280 /fs/f2fs/segment.c | |
parent | fadb2fb8af5348c1bc59cab17c6f8bf515e50d55 (diff) |
f2fs: introduce cp_lock to protect updating of ckpt_flags
This patch introduces spinlock to protect updating process of ckpt_flags
field in struct f2fs_checkpoint, it avoids incorrectly updating in race
condition.
Signed-off-by: Chao Yu <yuchao0@huawei.com>
[Jaegeuk Kim: add __is_set_ckpt_flags likewise __set_ckpt_flags]
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Diffstat (limited to 'fs/f2fs/segment.c')
-rw-r--r-- | fs/f2fs/segment.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index 2d23d7b17d6c..e78501ca761e 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c | |||
@@ -1801,7 +1801,7 @@ static int restore_curseg_summaries(struct f2fs_sb_info *sbi) | |||
1801 | int type = CURSEG_HOT_DATA; | 1801 | int type = CURSEG_HOT_DATA; |
1802 | int err; | 1802 | int err; |
1803 | 1803 | ||
1804 | if (is_set_ckpt_flags(F2FS_CKPT(sbi), CP_COMPACT_SUM_FLAG)) { | 1804 | if (is_set_ckpt_flags(sbi, CP_COMPACT_SUM_FLAG)) { |
1805 | int npages = npages_for_summary_flush(sbi, true); | 1805 | int npages = npages_for_summary_flush(sbi, true); |
1806 | 1806 | ||
1807 | if (npages >= 2) | 1807 | if (npages >= 2) |
@@ -1898,7 +1898,7 @@ static void write_normal_summaries(struct f2fs_sb_info *sbi, | |||
1898 | 1898 | ||
1899 | void write_data_summaries(struct f2fs_sb_info *sbi, block_t start_blk) | 1899 | void write_data_summaries(struct f2fs_sb_info *sbi, block_t start_blk) |
1900 | { | 1900 | { |
1901 | if (is_set_ckpt_flags(F2FS_CKPT(sbi), CP_COMPACT_SUM_FLAG)) | 1901 | if (is_set_ckpt_flags(sbi, CP_COMPACT_SUM_FLAG)) |
1902 | write_compacted_summaries(sbi, start_blk); | 1902 | write_compacted_summaries(sbi, start_blk); |
1903 | else | 1903 | else |
1904 | write_normal_summaries(sbi, start_blk, CURSEG_HOT_DATA); | 1904 | write_normal_summaries(sbi, start_blk, CURSEG_HOT_DATA); |