evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

f2fs: prevent waiter encountering incorrect discard states

Browse source 
In f2fs_submit_discard_endio, we will wake up waiter before setting
discard command states, so waiter may use incorrect states. Change
the order between complete() and states setting to fix this issue.

Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
This commit is contained in:
Chao Yu 2017-04-05 18:26:26 +08:00 • committed by Jaegeuk Kim
parent 745d922434
commit e09409d5c3
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
fs/f2fs/segment.c
View file

@ -717,9 +717,9 @@ static void f2fs_submit_discard_endio(struct bio *bio)
{ {
struct discard_cmd *dc = (struct discard_cmd *)bio->bi_private; struct discard_cmd *dc = (struct discard_cmd *)bio->bi_private;
complete(&dc->wait);
dc->error = bio->bi_error; dc->error = bio->bi_error;
dc->state = D_DONE; dc->state = D_DONE;
complete(&dc->wait);
bio_put(bio); bio_put(bio);
} }
@ -886,8 +886,7 @@ void f2fs_wait_discard_bio(struct f2fs_sb_info *sbi, block_t blkaddr)
list_for_each_entry_safe(dc, tmp, wait_list, list) { list_for_each_entry_safe(dc, tmp, wait_list, list) {
if (dc->lstart <= blkaddr && blkaddr < dc->lstart + dc->len) { if (dc->lstart <= blkaddr && blkaddr < dc->lstart + dc->len) {
if (dc->state == D_SUBMIT) wait_for_completion_io(&dc->wait);
wait_for_completion_io(&dc->wait);
__punch_discard_cmd(sbi, dc, blkaddr); __punch_discard_cmd(sbi, dc, blkaddr);
} }
} }
@ -947,8 +946,10 @@ repeat:
} }
list_for_each_entry_safe(dc, tmp, wait_list, list) { list_for_each_entry_safe(dc, tmp, wait_list, list) {
if (dc->state == D_DONE) if (dc->state == D_DONE) {
wait_for_completion_io(&dc->wait);
__remove_discard_cmd(sbi, dc); __remove_discard_cmd(sbi, dc);
}
} }
mutex_unlock(&dcc->cmd_lock); mutex_unlock(&dcc->cmd_lock);