diff options
author | Jaegeuk Kim <jaegeuk.kim@samsung.com> | 2014-04-01 20:04:42 -0400 |
---|---|---|
committer | Jaegeuk Kim <jaegeuk.kim@samsung.com> | 2014-04-01 20:56:27 -0400 |
commit | ce23447fe5764391025a67c20c97eaf5c6ac1ec3 (patch) | |
tree | 52efc6a6f4a78ed52514b50e0b72c93fc07864b5 /fs/f2fs | |
parent | d54c795b495b9bd417e482286c832c9a8eb210ae (diff) |
f2fs: fix to cover io->bio with io_rwsem
In the f2fs_wait_on_page_writeback, io->bio should be covered by io_rwsem.
Otherwise, the bio pointer can become a dangling pointer due to data races.
Signed-off-by: Jaegeuk Kim <jaegeuk.kim@samsung.com>
Diffstat (limited to 'fs/f2fs')
-rw-r--r-- | fs/f2fs/segment.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index cb49e6390ffa..f799c6a34c39 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c | |||
@@ -1049,15 +1049,14 @@ static inline bool is_merged_page(struct f2fs_sb_info *sbi, | |||
1049 | { | 1049 | { |
1050 | enum page_type btype = PAGE_TYPE_OF_BIO(type); | 1050 | enum page_type btype = PAGE_TYPE_OF_BIO(type); |
1051 | struct f2fs_bio_info *io = &sbi->write_io[btype]; | 1051 | struct f2fs_bio_info *io = &sbi->write_io[btype]; |
1052 | struct bio *bio = io->bio; | ||
1053 | struct bio_vec *bvec; | 1052 | struct bio_vec *bvec; |
1054 | int i; | 1053 | int i; |
1055 | 1054 | ||
1056 | down_read(&io->io_rwsem); | 1055 | down_read(&io->io_rwsem); |
1057 | if (!bio) | 1056 | if (!io->bio) |
1058 | goto out; | 1057 | goto out; |
1059 | 1058 | ||
1060 | bio_for_each_segment_all(bvec, bio, i) { | 1059 | bio_for_each_segment_all(bvec, io->bio, i) { |
1061 | if (page == bvec->bv_page) { | 1060 | if (page == bvec->bv_page) { |
1062 | up_read(&io->io_rwsem); | 1061 | up_read(&io->io_rwsem); |
1063 | return true; | 1062 | return true; |