diff options
Diffstat (limited to 'fs')
-rw-r--r-- | fs/nilfs2/the_nilfs.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/nilfs2/the_nilfs.c b/fs/nilfs2/the_nilfs.c index 6af1c0073e9e..4317f177ea7c 100644 --- a/fs/nilfs2/the_nilfs.c +++ b/fs/nilfs2/the_nilfs.c | |||
@@ -775,6 +775,7 @@ int nilfs_discard_segments(struct the_nilfs *nilfs, __u64 *segnump, | |||
775 | start * sects_per_block, | 775 | start * sects_per_block, |
776 | nblocks * sects_per_block, | 776 | nblocks * sects_per_block, |
777 | GFP_NOFS, | 777 | GFP_NOFS, |
778 | BLKDEV_IFL_WAIT | | ||
778 | BLKDEV_IFL_BARRIER); | 779 | BLKDEV_IFL_BARRIER); |
779 | if (ret < 0) | 780 | if (ret < 0) |
780 | return ret; | 781 | return ret; |
@@ -785,7 +786,8 @@ int nilfs_discard_segments(struct the_nilfs *nilfs, __u64 *segnump, | |||
785 | ret = blkdev_issue_discard(nilfs->ns_bdev, | 786 | ret = blkdev_issue_discard(nilfs->ns_bdev, |
786 | start * sects_per_block, | 787 | start * sects_per_block, |
787 | nblocks * sects_per_block, | 788 | nblocks * sects_per_block, |
788 | GFP_NOFS, BLKDEV_IFL_BARRIER); | 789 | GFP_NOFS, |
790 | BLKDEV_IFL_WAIT | BLKDEV_IFL_BARRIER); | ||
789 | return ret; | 791 | return ret; |
790 | } | 792 | } |
791 | 793 | ||