diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/blkdev.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 8ef705f800ab..6b305eb4a343 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h | |||
| @@ -881,13 +881,12 @@ extern int blkdev_issue_discard(struct block_device *bdev, sector_t sector, | |||
| 881 | sector_t nr_sects, gfp_t gfp_mask, unsigned long flags); | 881 | sector_t nr_sects, gfp_t gfp_mask, unsigned long flags); |
| 882 | extern int blkdev_issue_zeroout(struct block_device *bdev, sector_t sector, | 882 | extern int blkdev_issue_zeroout(struct block_device *bdev, sector_t sector, |
| 883 | sector_t nr_sects, gfp_t gfp_mask, unsigned long flags); | 883 | sector_t nr_sects, gfp_t gfp_mask, unsigned long flags); |
| 884 | static inline int sb_issue_discard(struct super_block *sb, | 884 | static inline int sb_issue_discard(struct super_block *sb, sector_t block, |
| 885 | sector_t block, sector_t nr_blocks) | 885 | sector_t nr_blocks, gfp_t gfp_mask, unsigned long flags) |
| 886 | { | 886 | { |
| 887 | block <<= (sb->s_blocksize_bits - 9); | 887 | return blkdev_issue_discard(sb->s_bdev, block << (sb->s_blocksize_bits - 9), |
| 888 | nr_blocks <<= (sb->s_blocksize_bits - 9); | 888 | nr_blocks << (sb->s_blocksize_bits - 9), |
| 889 | return blkdev_issue_discard(sb->s_bdev, block, nr_blocks, GFP_NOFS, | 889 | gfp_mask, flags); |
| 890 | BLKDEV_IFL_WAIT | BLKDEV_IFL_BARRIER); | ||
| 891 | } | 890 | } |
| 892 | 891 | ||
| 893 | extern int blk_verify_command(unsigned char *cmd, fmode_t has_write_perm); | 892 | extern int blk_verify_command(unsigned char *cmd, fmode_t has_write_perm); |