diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-11-13 15:09:52 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-11-13 15:09:52 -0800 |
| commit | b5dea9c0ab62a11bb52e6fa91c7d7e26d6ae8ec1 (patch) | |
| tree | 1c3304a837cc13c7878ea77448ef6770debe1922 /include | |
| parent | 1b1e9262ca644b5b7f1d12b2f8c2edfff420c5f3 (diff) | |
| parent | c01a21b77722db0474bbcc4eafc8c4e0d8fed6d8 (diff) | |
| download | linux-b5dea9c0ab62a11bb52e6fa91c7d7e26d6ae8ec1.tar.bz2 | |
Merge tag 'block-5.10-2020-11-13' of git://git.kernel.dk/linux-block
Pull block fixes from Jens Axboe:
"A few small fixes:
- NVMe pull request from Christoph:
- don't clear the read-only bit on a revalidate (Sagi Grimberg)
- nbd error case refcount leak (Christoph)
- loop/generic uevent fix (Christoph, Petr)"
* tag 'block-5.10-2020-11-13' of git://git.kernel.dk/linux-block:
loop: Fix occasional uevent drop
block: add a return value to set_capacity_revalidate_and_notify
nbd: fix a block_device refcount leak in nbd_release
nvme: fix incorrect behavior when BLKROSET is called by the user
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/genhd.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/genhd.h b/include/linux/genhd.h index 38f23d757013..03da3f603d30 100644 --- a/include/linux/genhd.h +++ b/include/linux/genhd.h @@ -315,7 +315,7 @@ static inline int get_disk_ro(struct gendisk *disk) extern void disk_block_events(struct gendisk *disk); extern void disk_unblock_events(struct gendisk *disk); extern void disk_flush_events(struct gendisk *disk, unsigned int mask); -void set_capacity_revalidate_and_notify(struct gendisk *disk, sector_t size, +bool set_capacity_revalidate_and_notify(struct gendisk *disk, sector_t size, bool update_bdev); /* drivers/char/random.c */ |