Commit 6bbf5914 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'block-5.14-2021-08-07' of git://git.kernel.dk/linux-block 

Pull block fixes from Jens Axboe:
 "A few minor fixes:

   - Fix ldm kernel-doc warning (Bart)

   - Fix adding offset twice for DMA address in n64cart (Christoph)

   - Fix use-after-free in dasd path handling (Stefan)

   - Order kyber insert trace correctly (Vincent)

   - raid1 errored write handling fix (Wei)

   - Fix blk-iolatency queue get failure handling (Yu)"

* tag 'block-5.14-2021-08-07' of git://git.kernel.dk/linux-block:
  kyber: make trace_block_rq call consistent with documentation
  block/partitions/ldm.c: Fix a kernel-doc warning
  blk-iolatency: error out if blk_get_queue() failed in iolatency_set_limit()
  n64cart: fix the dma address in n64cart_do_bvec
  s390/dasd: fix use after free in dasd path handling
  md/raid10: properly indicate failure when ending a failed write request
parents 0b6684ba fb7b9b02

block/blk-iolatency.c

+5 −1
Original line number Diff line number Diff line
@@ -833,7 +833,11 @@ static ssize_t iolatency_set_limit(struct kernfs_open_file *of, char *buf, 


	enable = iolatency_set_min_lat_nsec(blkg, lat_val);

	if (enable) {

		WARN_ON_ONCE(!blk_get_queue(blkg->q));

		if (!blk_get_queue(blkg->q)) {

			ret = -ENODEV;

			goto out;

		}



		blkg_get(blkg);

	}

block/kyber-iosched.c

+1 −1
Original line number Diff line number Diff line
@@ -596,13 +596,13 @@ static void kyber_insert_requests(struct blk_mq_hw_ctx *hctx, 
		struct list_head *head = &kcq->rq_list[sched_domain];



		spin_lock(&kcq->lock);

		trace_block_rq_insert(rq);

		if (at_head)

			list_move(&rq->queuelist, head);

		else

			list_move_tail(&rq->queuelist, head);

		sbitmap_set_bit(&khd->kcq_map[sched_domain],

				rq->mq_ctx->index_hw[hctx->type]);

		trace_block_rq_insert(rq);

		spin_unlock(&kcq->lock);

	}

}

block/partitions/ldm.c

+1 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-or-later

/**

/*

 * ldm - Support for Windows Logical Disk Manager (Dynamic Disks)

 *

 * Copyright (C) 2001,2002 Richard Russon <ldm@flatcap.org>

drivers/block/n64cart.c

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ static bool n64cart_do_bvec(struct device *dev, struct bio_vec *bv, u32 pos) 


	n64cart_wait_dma();



	n64cart_write_reg(PI_DRAM_REG, dma_addr + bv->bv_offset);

	n64cart_write_reg(PI_DRAM_REG, dma_addr);

	n64cart_write_reg(PI_CART_REG, (bstart | CART_DOMAIN) & CART_MAX);

	n64cart_write_reg(PI_WRITE_REG, bv->bv_len - 1);

drivers/md/raid1.c

+0 −2
Original line number Diff line number Diff line
@@ -474,8 +474,6 @@ static void raid1_end_write_request(struct bio *bio) 
		/*

		 * When the device is faulty, it is not necessary to

		 * handle write error.

		 * For failfast, this is the only remaining device,

		 * We need to retry the write without FailFast.

		 */

		if (!test_bit(Faulty, &rdev->flags))

			set_bit(R1BIO_WriteError, &r1_bio->state);