Commit a28e0852d45e65d9edf249c36e432b5e0a80f01d
Exists in
master
and in
4 other branches
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2: nilfs2: wait for discard to finish
Showing 1 changed file Side-by-side Diff
fs/nilfs2/the_nilfs.c
| ... | ... | @@ -775,6 +775,7 @@ |
| 775 | 775 | start * sects_per_block, |
| 776 | 776 | nblocks * sects_per_block, |
| 777 | 777 | GFP_NOFS, |
| 778 | + BLKDEV_IFL_WAIT | | |
| 778 | 779 | BLKDEV_IFL_BARRIER); |
| 779 | 780 | if (ret < 0) |
| 780 | 781 | return ret; |
| ... | ... | @@ -785,7 +786,8 @@ |
| 785 | 786 | ret = blkdev_issue_discard(nilfs->ns_bdev, |
| 786 | 787 | start * sects_per_block, |
| 787 | 788 | nblocks * sects_per_block, |
| 788 | - GFP_NOFS, BLKDEV_IFL_BARRIER); | |
| 789 | + GFP_NOFS, | |
| 790 | + BLKDEV_IFL_WAIT | BLKDEV_IFL_BARRIER); | |
| 789 | 791 | return ret; |
| 790 | 792 | } |
| 791 | 793 |