Commit 8b4805c6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents dc3e24b2 dc304326

block/blk-mq-debugfs.c

+1 −0
Original line number Diff line number Diff line
@@ -129,6 +129,7 @@ static const char *const blk_queue_flag_name[] = { 
	QUEUE_FLAG_NAME(PCI_P2PDMA),

	QUEUE_FLAG_NAME(ZONE_RESETALL),

	QUEUE_FLAG_NAME(RQ_ALLOC_TIME),

	QUEUE_FLAG_NAME(NOWAIT),

};

#undef QUEUE_FLAG_NAME

fs/block_dev.c

+1 −1
Original line number Diff line number Diff line
@@ -1055,7 +1055,6 @@ static void bd_finish_claiming(struct block_device *bdev, void *holder) 
/**

 * bd_abort_claiming - abort claiming of a block device

 * @bdev: block device of interest

 * @whole: whole block device

 * @holder: holder that has claimed @bdev

 *

 * Abort claiming of a block device when the exclusive open failed. This can be
@@ -1828,6 +1827,7 @@ const struct file_operations def_blk_fops = { 
/**

 * lookup_bdev  - lookup a struct block_device by name

 * @pathname:	special file representing the block device

 * @dev:	return value of the block device's dev_t

 *

 * Get a reference to the blockdevice at @pathname in the current

 * namespace if possible and return it.  Return ERR_PTR(error)