diff options
Diffstat (limited to 'fs/nilfs2/the_nilfs.c')
| -rw-r--r-- | fs/nilfs2/the_nilfs.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/fs/nilfs2/the_nilfs.c b/fs/nilfs2/the_nilfs.c index bd02b6127d35..0254be2d73c6 100644 --- a/fs/nilfs2/the_nilfs.c +++ b/fs/nilfs2/the_nilfs.c | |||
| @@ -635,9 +635,7 @@ int nilfs_discard_segments(struct the_nilfs *nilfs, __u64 *segnump, | |||
| 635 | ret = blkdev_issue_discard(nilfs->ns_bdev, | 635 | ret = blkdev_issue_discard(nilfs->ns_bdev, |
| 636 | start * sects_per_block, | 636 | start * sects_per_block, |
| 637 | nblocks * sects_per_block, | 637 | nblocks * sects_per_block, |
| 638 | GFP_NOFS, | 638 | GFP_NOFS, 0); |
| 639 | BLKDEV_IFL_WAIT | | ||
| 640 | BLKDEV_IFL_BARRIER); | ||
| 641 | if (ret < 0) | 639 | if (ret < 0) |
| 642 | return ret; | 640 | return ret; |
| 643 | nblocks = 0; | 641 | nblocks = 0; |
| @@ -647,8 +645,7 @@ int nilfs_discard_segments(struct the_nilfs *nilfs, __u64 *segnump, | |||
| 647 | ret = blkdev_issue_discard(nilfs->ns_bdev, | 645 | ret = blkdev_issue_discard(nilfs->ns_bdev, |
| 648 | start * sects_per_block, | 646 | start * sects_per_block, |
| 649 | nblocks * sects_per_block, | 647 | nblocks * sects_per_block, |
| 650 | GFP_NOFS, | 648 | GFP_NOFS, 0); |
| 651 | BLKDEV_IFL_WAIT | BLKDEV_IFL_BARRIER); | ||
| 652 | return ret; | 649 | return ret; |
| 653 | } | 650 | } |
| 654 | 651 | ||