@@ -3832,8 +3832,7 @@ void ext4_mb_release(struct super_block *sb)
3832
3832
}
3833
3833
3834
3834
static inline int ext4_issue_discard (struct super_block * sb ,
3835
- ext4_group_t block_group , ext4_grpblk_t cluster , int count ,
3836
- struct bio * * biop )
3835
+ ext4_group_t block_group , ext4_grpblk_t cluster , int count )
3837
3836
{
3838
3837
ext4_fsblk_t discard_block ;
3839
3838
@@ -3842,13 +3841,8 @@ static inline int ext4_issue_discard(struct super_block *sb,
3842
3841
count = EXT4_C2B (EXT4_SB (sb ), count );
3843
3842
trace_ext4_discard_blocks (sb ,
3844
3843
(unsigned long long ) discard_block , count );
3845
- if (biop ) {
3846
- return __blkdev_issue_discard (sb -> s_bdev ,
3847
- (sector_t )discard_block << (sb -> s_blocksize_bits - 9 ),
3848
- (sector_t )count << (sb -> s_blocksize_bits - 9 ),
3849
- GFP_NOFS , biop );
3850
- } else
3851
- return sb_issue_discard (sb , discard_block , count , GFP_NOFS , 0 );
3844
+
3845
+ return sb_issue_discard (sb , discard_block , count , GFP_NOFS , 0 );
3852
3846
}
3853
3847
3854
3848
static void ext4_free_data_in_buddy (struct super_block * sb ,
@@ -6495,7 +6489,7 @@ static void ext4_mb_clear_bb(handle_t *handle, struct inode *inode,
6495
6489
} else {
6496
6490
if (test_opt (sb , DISCARD )) {
6497
6491
err = ext4_issue_discard (sb , block_group , bit ,
6498
- count_clusters , NULL );
6492
+ count_clusters );
6499
6493
/*
6500
6494
* Ignore EOPNOTSUPP error. This is consistent with
6501
6495
* what happens when using journal.
@@ -6752,7 +6746,7 @@ __acquires(bitlock)
6752
6746
*/
6753
6747
mb_mark_used (e4b , & ex );
6754
6748
ext4_unlock_group (sb , group );
6755
- ret = ext4_issue_discard (sb , group , start , count , NULL );
6749
+ ret = ext4_issue_discard (sb , group , start , count );
6756
6750
ext4_lock_group (sb , group );
6757
6751
mb_free_blocks (NULL , e4b , start , ex .fe_len );
6758
6752
return ret ;
0 commit comments