diff options
author | Chao Yu <yuchao0@huawei.com> | 2016-09-19 22:29:47 -0400 |
---|---|---|
committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2016-09-30 13:05:50 -0400 |
commit | fadb2fb8af5348c1bc59cab17c6f8bf515e50d55 (patch) | |
tree | 437503e890baf0603218fa20d36cbc1ecf3102ec | |
parent | 9e1e6df412a28cdbbd2909de5c6189eda4a3383d (diff) |
f2fs: fix to avoid race condition when updating sbi flag
Making updating of sbi flag atomic by using {test,set,clear}_bit,
otherwise in concurrency scenario, the flag could be updated incorrectly.
Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
-rw-r--r-- | fs/f2fs/f2fs.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index cda8e6f96618..04e96181e928 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h | |||
@@ -777,7 +777,7 @@ struct f2fs_sb_info { | |||
777 | struct proc_dir_entry *s_proc; /* proc entry */ | 777 | struct proc_dir_entry *s_proc; /* proc entry */ |
778 | struct f2fs_super_block *raw_super; /* raw super block pointer */ | 778 | struct f2fs_super_block *raw_super; /* raw super block pointer */ |
779 | int valid_super_block; /* valid super block no */ | 779 | int valid_super_block; /* valid super block no */ |
780 | int s_flag; /* flags for sbi */ | 780 | unsigned long s_flag; /* flags for sbi */ |
781 | 781 | ||
782 | #ifdef CONFIG_F2FS_FS_ENCRYPTION | 782 | #ifdef CONFIG_F2FS_FS_ENCRYPTION |
783 | u8 key_prefix[F2FS_KEY_DESC_PREFIX_SIZE]; | 783 | u8 key_prefix[F2FS_KEY_DESC_PREFIX_SIZE]; |
@@ -1046,17 +1046,17 @@ static inline struct address_space *NODE_MAPPING(struct f2fs_sb_info *sbi) | |||
1046 | 1046 | ||
1047 | static inline bool is_sbi_flag_set(struct f2fs_sb_info *sbi, unsigned int type) | 1047 | static inline bool is_sbi_flag_set(struct f2fs_sb_info *sbi, unsigned int type) |
1048 | { | 1048 | { |
1049 | return sbi->s_flag & (0x01 << type); | 1049 | return test_bit(type, &sbi->s_flag); |
1050 | } | 1050 | } |
1051 | 1051 | ||
1052 | static inline void set_sbi_flag(struct f2fs_sb_info *sbi, unsigned int type) | 1052 | static inline void set_sbi_flag(struct f2fs_sb_info *sbi, unsigned int type) |
1053 | { | 1053 | { |
1054 | sbi->s_flag |= (0x01 << type); | 1054 | set_bit(type, &sbi->s_flag); |
1055 | } | 1055 | } |
1056 | 1056 | ||
1057 | static inline void clear_sbi_flag(struct f2fs_sb_info *sbi, unsigned int type) | 1057 | static inline void clear_sbi_flag(struct f2fs_sb_info *sbi, unsigned int type) |
1058 | { | 1058 | { |
1059 | sbi->s_flag &= ~(0x01 << type); | 1059 | clear_bit(type, &sbi->s_flag); |
1060 | } | 1060 | } |
1061 | 1061 | ||
1062 | static inline unsigned long long cur_cp_version(struct f2fs_checkpoint *cp) | 1062 | static inline unsigned long long cur_cp_version(struct f2fs_checkpoint *cp) |