diff options
| author | Anand Jain | 2017-11-29 11:53:43 +0100 |
|---|---|---|
| committer | David Sterba | 2018-01-22 16:08:14 +0100 |
| commit | 38b5f68e98117daa221c7df813608f48c374aef4 (patch) | |
| tree | caeb7034684a836cae7d340d89335e417c1f739e /fs/btrfs/extent-tree.c | |
| parent | btrfs: make function update_share_count static (diff) | |
| download | kernel-qcow2-linux-38b5f68e98117daa221c7df813608f48c374aef4.tar.gz kernel-qcow2-linux-38b5f68e98117daa221c7df813608f48c374aef4.tar.xz kernel-qcow2-linux-38b5f68e98117daa221c7df813608f48c374aef4.zip | |
btrfs: drop btrfs_device::can_discard to query directly
We can query the bdev directly when needed at btrfs_discard_extent()
so drop btrfs_device::can_discard.
Signed-off-by: Anand Jain <anand.jain@oracle.com>
Suggested-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/extent-tree.c')
| -rw-r--r-- | fs/btrfs/extent-tree.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index 696275b7b66a..7411f65099d1 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -2145,7 +2145,10 @@ int btrfs_discard_extent(struct btrfs_fs_info *fs_info, u64 bytenr, for (i = 0; i < bbio->num_stripes; i++, stripe++) { u64 bytes; - if (!stripe->dev->can_discard) + struct request_queue *req_q; + + req_q = bdev_get_queue(stripe->dev->bdev); + if (!blk_queue_discard(req_q)) continue; ret = btrfs_issue_discard(stripe->dev->bdev, |