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 ba7c10c917f..d2771510337 100644 --- a/fs/nilfs2/the_nilfs.c +++ b/fs/nilfs2/the_nilfs.c | |||
| @@ -775,9 +775,7 @@ int nilfs_discard_segments(struct the_nilfs *nilfs, __u64 *segnump, | |||
| 775 | ret = blkdev_issue_discard(nilfs->ns_bdev, | 775 | ret = blkdev_issue_discard(nilfs->ns_bdev, |
| 776 | start * sects_per_block, | 776 | start * sects_per_block, |
| 777 | nblocks * sects_per_block, | 777 | nblocks * sects_per_block, |
| 778 | GFP_NOFS, | 778 | GFP_NOFS, 0); |
| 779 | BLKDEV_IFL_WAIT | | ||
| 780 | BLKDEV_IFL_BARRIER); | ||
| 781 | if (ret < 0) | 779 | if (ret < 0) |
| 782 | return ret; | 780 | return ret; |
| 783 | nblocks = 0; | 781 | nblocks = 0; |
| @@ -787,8 +785,7 @@ int nilfs_discard_segments(struct the_nilfs *nilfs, __u64 *segnump, | |||
| 787 | ret = blkdev_issue_discard(nilfs->ns_bdev, | 785 | ret = blkdev_issue_discard(nilfs->ns_bdev, |
| 788 | start * sects_per_block, | 786 | start * sects_per_block, |
| 789 | nblocks * sects_per_block, | 787 | nblocks * sects_per_block, |
| 790 | GFP_NOFS, | 788 | GFP_NOFS, 0); |
| 791 | BLKDEV_IFL_WAIT | BLKDEV_IFL_BARRIER); | ||
| 792 | return ret; | 789 | return ret; |
| 793 | } | 790 | } |
| 794 | 791 | ||