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

Commit 5e2078b2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull misc block fixes from Jens Axboe:
 "Stuff that got collected after the merge window opened.  This
  contains:

   - NVMe:
        - Fix for non-striped transfer size setting for NVMe from
          Sathyavathi.
        - (Some) support for the weird Apple nvme controller in the
          macbooks. From Stephan Günther.

   - The error value leak for dax from Al.

   - A few minor blk-mq tweaks from me.

   - Add the new linux-block@vger.kernel.org mailing list to the
     MAINTAINERS file.

   - Discard fix for brd, from Jan.

   - A kerneldoc warning for block core from Randy.

   - An older fix from Vivek, converting a WARN_ON() to a rate limited
     printk when a device is hot removed with dirty inodes"

* 'for-linus' of git://git.kernel.dk/linux-block:
  block: don't hardcode blk_qc_t -> tag mask
  dax_io(): don't let non-error value escape via retval instead of EFAULT
  block: fix blk-core.c kernel-doc warning
  fs/block_dev.c: Remove WARN_ON() when inode writeback fails
  NVMe: add support for Apple NVMe controller
  NVMe: use split lo_hi_{read,write}q
  blk-mq: mark __blk_mq_complete_request() static
  MAINTAINERS: add reference to new linux-block list
  NVMe: Increase the max transfer size when mdts is 0
  brd: Refuse improperly aligned discard requests
parents a4d8c7c9 e3a7a3bf

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -2210,6 +2210,7 @@ F: drivers/leds/leds-blinkm.c 


BLOCK LAYER

M:	Jens Axboe <axboe@kernel.dk>

L:	linux-block@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git

S:	Maintained

F:	block/

block/blk-core.c

+3 −0
Original line number Diff line number Diff line
@@ -1575,6 +1575,9 @@ bool bio_attempt_front_merge(struct request_queue *q, struct request *req, 
 * @q: request_queue new bio is being queued at

 * @bio: new bio being queued

 * @request_count: out parameter for number of traversed plugged requests

 * @same_queue_rq: pointer to &struct request that gets filled in when

 * another request associated with @q is found on the plug list

 * (optional, may be %NULL)

 *

 * Determine whether @bio being queued on @q can be merged with a request

 * on %current's plugged list.  Returns %true if merge was successful,

block/blk-mq.c

+1 −1
Original line number Diff line number Diff line
@@ -358,7 +358,7 @@ static void blk_mq_ipi_complete_request(struct request *rq) 
	put_cpu();

}



void __blk_mq_complete_request(struct request *rq)

static void __blk_mq_complete_request(struct request *rq)

{

	struct request_queue *q = rq->q;

block/blk-mq.h

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ struct blk_mq_ctx { 
	struct kobject		kobj;

} ____cacheline_aligned_in_smp;



void __blk_mq_complete_request(struct request *rq);

void blk_mq_run_hw_queue(struct blk_mq_hw_ctx *hctx, bool async);

void blk_mq_freeze_queue(struct request_queue *q);

void blk_mq_free_queue(struct request_queue *q);

drivers/block/brd.c

+3 −0
Original line number Diff line number Diff line
@@ -337,6 +337,9 @@ static blk_qc_t brd_make_request(struct request_queue *q, struct bio *bio) 
		goto io_error;



	if (unlikely(bio->bi_rw & REQ_DISCARD)) {

		if (sector & ((PAGE_SIZE >> SECTOR_SHIFT) - 1) ||

		    bio->bi_iter.bi_size & PAGE_MASK)

			goto io_error;

		discard_from_brd(brd, sector, bio->bi_iter.bi_size);

		goto out;

	}