Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6080ad3a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus-20181026' of git://git.kernel.dk/linux-block 

Pull more block layer updates from Jens Axboe:

 - Set of patches improving support for zoned devices. This was ready
   before the merge window, but I was late in picking it up and hence it
   missed the original pull request (Damien, Christoph)

 - libata no link power management quirk addition for a Samsung drive
   (Diego Viola)

 - Fix for a performance regression in BFQ that went into this merge
   window (Federico Motta)

 - Fix for a missing dma mask setting return value check (Gustavo)

 - Typo in the gdrom queue failure case (me)

 - NULL pointer deref fix for xen-blkfront (Vasilis Liaskovitis)

 - Fixing the get_rq trace point placement in blk-mq (Xiaoguang Wang)

 - Removal of a set-but-not-read variable in cdrom (zhong jiang)

* tag 'for-linus-20181026' of git://git.kernel.dk/linux-block:
  libata: Apply NOLPM quirk for SAMSUNG MZ7TD256HAFV-000L9
  block, bfq: fix asymmetric scenarios detection
  gdrom: fix mistake in assignment of error
  blk-mq: place trace_block_getrq() in correct place
  block: Introduce blk_revalidate_disk_zones()
  block: add a report_zones method
  block: Expose queue nr_zones in sysfs
  block: Improve zone reset execution
  block: Introduce BLKGETNRZONES ioctl
  block: Introduce BLKGETZONESZ ioctl
  block: Limit allocation of zone descriptors for report zones
  block: Introduce blkdev_nr_zones() helper
  scsi: sd_zbc: Fix sd_zbc_check_zones() error checks
  scsi: sd_zbc: Reduce boot device scan and revalidate time
  scsi: sd_zbc: Rearrange code
  cdrom: remove set but not used variable 'tocuse'
  skd: fix unchecked return values
  xen/blkfront: avoid NULL blkfront_info dereference on device removal
parents b27186ab a435ab4f

block/bfq-wf2q.c

+6 −12
Original line number Diff line number Diff line
@@ -792,24 +792,18 @@ __bfq_entity_update_weight_prio(struct bfq_service_tree *old_st, 
		 * queue, remove the entity from its old weight counter (if

		 * there is a counter associated with the entity).

		 */

		if (prev_weight != new_weight) {

			if (bfqq) {

		if (prev_weight != new_weight && bfqq) {

			root = &bfqd->queue_weights_tree;

			__bfq_weights_tree_remove(bfqd, bfqq, root);

			} else

				bfqd->num_active_groups--;

		}

		entity->weight = new_weight;

		/*

		 * Add the entity, if it is not a weight-raised queue,

		 * to the counter associated with its new weight.

		 */

		if (prev_weight != new_weight) {

			if (bfqq && bfqq->wr_coeff == 1) {

		if (prev_weight != new_weight && bfqq && bfqq->wr_coeff == 1) {

			/* If we get here, root has been initialized. */

			bfq_weights_tree_add(bfqd, bfqq, root);

			} else

				bfqd->num_active_groups++;

		}



		new_st->wsum += entity->weight;

block/blk-core.c

+0 −1
Original line number Diff line number Diff line
@@ -2300,7 +2300,6 @@ generic_make_request_checks(struct bio *bio) 
		if (!q->limits.max_write_same_sectors)

			goto not_supported;

		break;

	case REQ_OP_ZONE_REPORT:

	case REQ_OP_ZONE_RESET:

		if (!blk_queue_is_zoned(q))

			goto not_supported;

block/blk-lib.c

+6 −7
Original line number Diff line number Diff line
@@ -10,8 +10,7 @@ 


#include "blk.h"



static struct bio *next_bio(struct bio *bio, unsigned int nr_pages,

		gfp_t gfp)

struct bio *blk_next_bio(struct bio *bio, unsigned int nr_pages, gfp_t gfp)

{

	struct bio *new = bio_alloc(gfp, nr_pages);
@@ -63,7 +62,7 @@ int __blkdev_issue_discard(struct block_device *bdev, sector_t sector, 


		end_sect = sector + req_sects;



		bio = next_bio(bio, 0, gfp_mask);

		bio = blk_next_bio(bio, 0, gfp_mask);

		bio->bi_iter.bi_sector = sector;

		bio_set_dev(bio, bdev);

		bio_set_op_attrs(bio, op, 0);
@@ -165,7 +164,7 @@ static int __blkdev_issue_write_same(struct block_device *bdev, sector_t sector, 
	max_write_same_sectors = UINT_MAX >> 9;



	while (nr_sects) {

		bio = next_bio(bio, 1, gfp_mask);

		bio = blk_next_bio(bio, 1, gfp_mask);

		bio->bi_iter.bi_sector = sector;

		bio_set_dev(bio, bdev);

		bio->bi_vcnt = 1;
@@ -241,7 +240,7 @@ static int __blkdev_issue_write_zeroes(struct block_device *bdev, 
		return -EOPNOTSUPP;



	while (nr_sects) {

		bio = next_bio(bio, 0, gfp_mask);

		bio = blk_next_bio(bio, 0, gfp_mask);

		bio->bi_iter.bi_sector = sector;

		bio_set_dev(bio, bdev);

		bio->bi_opf = REQ_OP_WRITE_ZEROES;
@@ -292,7 +291,7 @@ static int __blkdev_issue_zero_pages(struct block_device *bdev, 
		return -EPERM;



	while (nr_sects != 0) {

		bio = next_bio(bio, __blkdev_sectors_to_bio_pages(nr_sects),

		bio = blk_next_bio(bio, __blkdev_sectors_to_bio_pages(nr_sects),

				   gfp_mask);

		bio->bi_iter.bi_sector = sector;

		bio_set_dev(bio, bdev);

block/blk-mq-debugfs.c

+0 −1
Original line number Diff line number Diff line
@@ -283,7 +283,6 @@ static const char *const op_name[] = { 
	REQ_OP_NAME(WRITE),

	REQ_OP_NAME(FLUSH),

	REQ_OP_NAME(DISCARD),

	REQ_OP_NAME(ZONE_REPORT),

	REQ_OP_NAME(SECURE_ERASE),

	REQ_OP_NAME(ZONE_RESET),

	REQ_OP_NAME(WRITE_SAME),

block/blk-mq.c

+2 −2
Original line number Diff line number Diff line
@@ -1850,8 +1850,6 @@ static blk_qc_t blk_mq_make_request(struct request_queue *q, struct bio *bio) 


	rq_qos_throttle(q, bio, NULL);



	trace_block_getrq(q, bio, bio->bi_opf);



	rq = blk_mq_get_request(q, bio, bio->bi_opf, &data);

	if (unlikely(!rq)) {

		rq_qos_cleanup(q, bio);
@@ -1860,6 +1858,8 @@ static blk_qc_t blk_mq_make_request(struct request_queue *q, struct bio *bio) 
		return BLK_QC_T_NONE;

	}



	trace_block_getrq(q, bio, bio->bi_opf);



	rq_qos_track(q, rq, bio);



	cookie = request_to_qc_t(data.hctx, rq);