Christoph Hellwig 0257dc08a4 block: ensure discard_granularity is zero when discard is not supported ...

[ Upstream commit fad6551fcf ]

Documentation/ABI/stable/sysfs-block states:

  What: /sys/block/<disk>/queue/discard_granularity
  [...]
  A discard_granularity of 0 means that the device does not support
  discard functionality.

but this got broken when sorting out the block limits updates.  Fix this
by setting the discard_granularity limit to zero when the combined
max_discard_sectors is zero.

Fixes: 3c407dc723 ("block: default the discard granularity to sector size")
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Link: https://lore.kernel.org/r/20250731152228.873923-1-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin <sashal@kernel.org>

2025-08-15 12:14:05 +02:00

..

partitions

block: fix conversion of GPT partition name to 7-bit

2025-03-13 13:01:58 +01:00

badblocks.c

badblocks: Fix a nonsense WARN_ON() which checks whether a u64 variable < 0

2025-05-29 11:02:24 +02:00

bdev.c

block: fix race between set_blocksize and read paths

2025-05-29 11:02:01 +02:00

bfq-cgroup.c

Revert "block, bfq: merge bfq_release_process_ref() into bfq_put_cooperator()"

2024-12-05 14:02:54 +01:00

bfq-iosched.c

block, bfq: fix waker_bfqq UAF after bfq_split_bfqq()

2025-01-17 13:40:59 +01:00

bfq-iosched.h

…

bfq-wf2q.c

…

bio-integrity.c

block: integrity: Do not call set_page_dirty_lock()

2025-04-25 10:47:50 +02:00

bio.c

block: fix adding folio to bio

2025-06-10 07:12:59 -04:00

blk-cgroup-fc-appid.c

…

blk-cgroup-rwstat.c

…

blk-cgroup-rwstat.h

…

blk-cgroup.c

blk-cgroup: improve policy registration error handling

2025-05-29 11:02:13 +02:00

blk-cgroup.h

…

blk-core.c

block: add a rq_list type

2025-04-25 10:48:06 +02:00

blk-crypto-fallback.c

…

blk-crypto-internal.h

…

blk-crypto-profile.c

…

blk-crypto-sysfs.c

…

blk-crypto.c

…

blk-flush.c

…

blk-ia-ranges.c

…

blk-integrity.c

…

blk-ioc.c

…

blk-iocost.c

blk-iocost: Avoid using clamp() on inuse in __propagate_weights()

2024-12-19 18:13:22 +01:00

blk-iolatency.c

…

blk-ioprio.c

…

blk-ioprio.h

…

blk-lib.c

…

blk-map.c

block: fix queue limits checks in blk_rq_map_user_bvec for real

2024-10-28 12:35:05 -06:00

blk-merge.c

block: use plug request list tail for one-shot backmerge attempt

2025-06-27 11:11:19 +01:00

blk-mq-cpumap.c

blk-mq: create correct map for fallback case

2025-05-09 09:50:48 +02:00

blk-mq-debugfs.c

…

blk-mq-debugfs.h

…

blk-mq-pci.c

…

blk-mq-sched.c

…

blk-mq-sched.h

…

blk-mq-sysfs.c

block: Revert "block: Fix potential deadlock while freezing queue and acquiring sysfs_lock"

2024-12-27 14:02:07 +01:00

blk-mq-tag.c

…

blk-mq-virtio.c

…

blk-mq.c

block: make sure ->nr_integrity_segments is cloned in blk_rq_prep_clone

2025-05-02 07:58:54 +02:00

blk-mq.h

block: add a rq_list type

2025-04-25 10:48:06 +02:00

blk-pm.c

…

blk-pm.h

…

blk-rq-qos.c

…

blk-rq-qos.h

…

blk-settings.c

block: ensure discard_granularity is zero when discard is not supported

2025-08-15 12:14:05 +02:00

blk-stat.c

…

blk-stat.h

…

blk-sysfs.c

block: fix kobject leak in blk_unregister_queue

2025-07-24 08:56:30 +02:00

blk-throttle.c

blk-throttle: don't take carryover for prioritized processing of metadata

2025-05-29 11:02:29 +02:00

blk-throttle.h

…

blk-timeout.c

…

blk-wbt.c

…

blk-wbt.h

…

blk-zoned.c

block: Clear BIO_EMULATES_ZONE_APPEND flag on BIO completion

2025-06-27 11:11:19 +01:00

blk.h

block: only update request sector if needed

2025-05-29 11:03:12 +02:00

bounce.c

block: mark bounce buffering as incompatible with integrity

2025-05-29 11:02:32 +02:00

bsg-lib.c

…

bsg.c

…

disk-events.c

…

early-lookup.c

…

elevator.c

block: use q->elevator with ->elevator_lock held in elv_iosched_show()

2025-06-19 15:32:32 +02:00

elevator.h

…

fops.c

block: fix race between set_blocksize and read paths

2025-05-29 11:02:01 +02:00

genhd.c

block: retry call probe after request_module in blk_request_module

2025-02-08 09:56:51 +01:00

holder.c

…

ioctl.c

block: fix race between set_blocksize and read paths

2025-05-29 11:02:01 +02:00

ioprio.c

…

Kconfig

…

Kconfig.iosched

…

kyber-iosched.c

…

Makefile

…

mq-deadline.c

mq-deadline: don't call req_get_ioprio from the I/O completion handler

2025-05-02 07:59:33 +02:00

opal_proto.h

…

sed-opal.c

…

t10-pi.c

…