tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'block-5.11-2021-01-01' of git://git.kernel.dk/linux-block

Pull block fixes from Jens Axboe:
"Two minor block fixes from this last week that should go into 5.11:

- Add missing NOWAIT debugfs definition (Andres)

- Fix kerneldoc warning introduced this merge window (Randy)"

* tag 'block-5.11-2021-01-01' of git://git.kernel.dk/linux-block:
block: add debugfs stanza for QUEUE_FLAG_NOWAIT
fs: block_dev.c: fix kernel-doc warnings from struct block_device changes

Linus Torvalds 8b4805c6 dc3e24b2

+2 -1
+1
block/blk-mq-debugfs.c
··· 129 129 QUEUE_FLAG_NAME(PCI_P2PDMA), 130 130 QUEUE_FLAG_NAME(ZONE_RESETALL), 131 131 QUEUE_FLAG_NAME(RQ_ALLOC_TIME), 132 + QUEUE_FLAG_NAME(NOWAIT), 132 133 }; 133 134 #undef QUEUE_FLAG_NAME 134 135
+1 -1
fs/block_dev.c
··· 1055 1055 /** 1056 1056 * bd_abort_claiming - abort claiming of a block device 1057 1057 * @bdev: block device of interest 1058 - * @whole: whole block device 1059 1058 * @holder: holder that has claimed @bdev 1060 1059 * 1061 1060 * Abort claiming of a block device when the exclusive open failed. This can be ··· 1827 1828 /** 1828 1829 * lookup_bdev - lookup a struct block_device by name 1829 1830 * @pathname: special file representing the block device 1831 + * @dev: return value of the block device's dev_t 1830 1832 * 1831 1833 * Get a reference to the blockdevice at @pathname in the current 1832 1834 * namespace if possible and return it. Return ERR_PTR(error)