diff options
| author | Mike Snitzer <snitzer@redhat.com> | 2018-07-20 14:57:38 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-09-26 08:38:00 +0200 |
| commit | 030f2ad6ce16f3c49e4d9c65a4cd36f477f8e7b9 (patch) | |
| tree | 6d5d5baa019e2b74b311d0de77d1866d35422f23 /block | |
| parent | 394df591433deffef83b794bf95bd7ab12d56497 (diff) | |
| download | linux-stable-030f2ad6ce16f3c49e4d9c65a4cd36f477f8e7b9.tar.gz linux-stable-030f2ad6ce16f3c49e4d9c65a4cd36f477f8e7b9.tar.bz2 linux-stable-030f2ad6ce16f3c49e4d9c65a4cd36f477f8e7b9.zip | |
block: allow max_discard_segments to be stacked
[ Upstream commit 42c9cdfe1e11e083dceb0f0c4977b758cf7403b9 ]
Set max_discard_segments to USHRT_MAX in blk_set_stacking_limits() so
that blk_stack_limits() can stack up this limit for stacked devices.
before:
$ cat /sys/block/nvme0n1/queue/max_discard_segments
256
$ cat /sys/block/dm-0/queue/max_discard_segments
1
after:
$ cat /sys/block/nvme0n1/queue/max_discard_segments
256
$ cat /sys/block/dm-0/queue/max_discard_segments
256
Fixes: 1e739730c5b9e ("block: optionally merge discontiguous discard bios into a single request")
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-settings.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-settings.c b/block/blk-settings.c index 8559e9563c52..474b0b95fcd1 100644 --- a/block/blk-settings.c +++ b/block/blk-settings.c @@ -128,7 +128,7 @@ void blk_set_stacking_limits(struct queue_limits *lim) /* Inherit limits from component devices */ lim->max_segments = USHRT_MAX; - lim->max_discard_segments = 1; + lim->max_discard_segments = USHRT_MAX; lim->max_hw_sectors = UINT_MAX; lim->max_segment_size = UINT_MAX; lim->max_sectors = UINT_MAX; |