Commit 9caaa66c authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge branch 'for-5.9/block' into for-5.9/block-merge 

* for-5.9/block: (124 commits)
  blk-cgroup: show global disk stats in root cgroup io.stat
  blk-cgroup: make iostat functions visible to stat printing
  block: improve discard bio alignment in __blkdev_issue_discard()
  block: change REQ_OP_ZONE_RESET and REQ_OP_ZONE_RESET_ALL to be odd numbers
  block: defer flush request no matter whether we have elevator
  block: make blk_timeout_init() static
  block: remove retry loop in ioc_release_fn()
  block: remove unnecessary ioc nested locking
  block: integrate bd_start_claiming into __blkdev_get
  block: use bd_prepare_to_claim directly in the loop driver
  block: refactor bd_start_claiming
  block: simplify the restart case in __blkdev_get
  Revert "blk-rq-qos: remove redundant finish_wait to rq_qos_wait."
  block: always remove partitions from blk_drop_partitions()
  block: relax jiffies rounding for timeouts
  blk-mq: remove redundant validation in __blk_mq_end_request()
  blk-mq: Remove unnecessary local variable
  writeback: remove bdi->congested_fn
  writeback: remove struct bdi_writeback_congested
  writeback: remove {set,clear}_wb_congested
  ...
parents ba47d845 ef45fe47

Documentation/admin-guide/cgroup-v2.rst

+1 −2
Original line number Original line Diff line number Diff line
@@ -1483,8 +1483,7 @@ IO Interface Files 
~~~~~~~~~~~~~~~~~~

~~~~~~~~~~~~~~~~~~





  io.stat

  io.stat

	A read-only nested-keyed file which exists on non-root

	A read-only nested-keyed file.

	cgroups.





	Lines are keyed by $MAJ:$MIN device numbers and not ordered.

	Lines are keyed by $MAJ:$MIN device numbers and not ordered.

	The following nested keys are defined.

	The following nested keys are defined.

Documentation/block/biodoc.rst

+1 −1
Original line number Original line Diff line number Diff line
@@ -1036,7 +1036,7 @@ Now the generic block layer performs partition-remapping early and thus 
provides drivers with a sector number relative to whole device, rather than

provides drivers with a sector number relative to whole device, rather than

having to take partition number into account in order to arrive at the true

having to take partition number into account in order to arrive at the true

sector number. The routine blk_partition_remap() is invoked by

sector number. The routine blk_partition_remap() is invoked by

generic_make_request even before invoking the queue specific make_request_fn,

submit_bio_noacct even before invoking the queue specific ->submit_bio,

so the i/o scheduler also gets to operate on whole disk sector numbers. This

so the i/o scheduler also gets to operate on whole disk sector numbers. This

should typically not require changes to block drivers, it just never gets

should typically not require changes to block drivers, it just never gets

to invoke its own partition sector offset calculations since all bios

to invoke its own partition sector offset calculations since all bios

Documentation/block/writeback_cache_control.rst

+1 −1
Original line number Original line Diff line number Diff line
@@ -47,7 +47,7 @@ the Forced Unit Access is implemented. The REQ_PREFLUSH and REQ_FUA flags 
may both be set on a single bio.

may both be set on a single bio.









Implementation details for make_request_fn based block drivers

Implementation details for bio based block drivers

--------------------------------------------------------------

--------------------------------------------------------------





These drivers will always see the REQ_PREFLUSH and REQ_FUA bits as they sit

These drivers will always see the REQ_PREFLUSH and REQ_FUA bits as they sit

Documentation/cdrom/cdrom-standard.rst

+1 −17
Original line number Original line Diff line number Diff line
@@ -157,7 +157,6 @@ with the kernel as a block device by registering the following general 
		cdrom_release,		/∗ release ∗/

		cdrom_release,		/∗ release ∗/

		NULL,			/∗ fsync ∗/

		NULL,			/∗ fsync ∗/

		NULL,			/∗ fasync ∗/

		NULL,			/∗ fasync ∗/

		cdrom_media_changed,	/∗ media change ∗/

		NULL			/∗ revalidate ∗/

		NULL			/∗ revalidate ∗/

	};

	};
@@ -366,19 +365,6 @@ which may or may not be in the drive). If the drive is not a changer, 
	CDS_DRIVE_NOT_READY	/* something is wrong, tray is moving? */

	CDS_DRIVE_NOT_READY	/* something is wrong, tray is moving? */

	CDS_DISC_OK		/* a disc is loaded and everything is fine */

	CDS_DISC_OK		/* a disc is loaded and everything is fine */





::



	int media_changed(struct cdrom_device_info *cdi, int disc_nr)



This function is very similar to the original function in $struct

file_operations*. It returns 1 if the medium of the device *cdi->dev*

has changed since the last call, and 0 otherwise. The parameter

*disc_nr* identifies a specific slot in a juke-box, it should be

ignored for single-disc drives. Note that by `re-routing` this

function through *cdrom_media_changed()*, we can implement separate

queues for the VFS and a new *ioctl()* function that can report device

changes to software (e. g., an auto-mounting daemon).



::

::





	int tray_move(struct cdrom_device_info *cdi, int position)

	int tray_move(struct cdrom_device_info *cdi, int position)
@@ -917,9 +903,7 @@ commands can be identified by the underscores in their names. 
	maximum number of discs in the juke-box found in the *cdrom_dops*.

	maximum number of discs in the juke-box found in the *cdrom_dops*.

`CDROM_MEDIA_CHANGED`

`CDROM_MEDIA_CHANGED`

	Returns 1 if a disc has been changed since the last call.

	Returns 1 if a disc has been changed since the last call.

	Note that calls to *cdrom_media_changed* by the VFS are treated

	For juke-boxes, an extra argument *arg*

	by an independent queue, so both mechanisms will detect a

	media change once. For juke-boxes, an extra argument *arg*

	specifies the slot for which the information is given. The special

	specifies the slot for which the information is given. The special

	value *CDSL_CURRENT* requests that information about the currently

	value *CDSL_CURRENT* requests that information about the currently

	selected slot be returned.

	selected slot be returned.

Documentation/fault-injection/fault-injection.rst

+1 −1
Original line number Original line Diff line number Diff line
@@ -24,7 +24,7 @@ Available fault injection capabilities 




  injects disk IO errors on devices permitted by setting

  injects disk IO errors on devices permitted by setting

  /sys/block/<device>/make-it-fail or

  /sys/block/<device>/make-it-fail or

  /sys/block/<device>/<partition>/make-it-fail. (generic_make_request())

  /sys/block/<device>/<partition>/make-it-fail. (submit_bio_noacct())





- fail_mmc_request

- fail_mmc_request

CRA Git | Maintained and supported by SUSTech CRA and CCSE