From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 21 Jan 2025 03:38:46 +0000 (-0800)
Subject: Merge tag 'for-6.14/block-20250118' of git://git.kernel.dk/linux
X-Git-Tag: v6.14-rc1~202
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1cbfb828e05171ca2dd77b5988d068e6872480fe;p=thirdparty%2Flinux.git

Merge tag 'for-6.14/block-20250118' of git://git.kernel.dk/linux

Pull block updates from Jens Axboe:

 - NVMe pull requests via Keith:
      - Target support for PCI-Endpoint transport (Damien)
      - TCP IO queue spreading fixes (Sagi, Chaitanya)
      - Target handling for "limited retry" flags (Guixen)
      - Poll type fix (Yongsoo)
      - Xarray storage error handling (Keisuke)
      - Host memory buffer free size fix on error (Francis)

 - MD pull requests via Song:
      - Reintroduce md-linear (Yu Kuai)
      - md-bitmap refactor and fix (Yu Kuai)
      - Replace kmap_atomic with kmap_local_page (David Reaver)

 - Quite a few queue freeze and debugfs deadlock fixes

   Ming introduced lockdep support for this in the 6.13 kernel, and it
   has (unsurprisingly) uncovered quite a few issues

 - Use const attributes for IO schedulers

 - Remove bio ioprio wrappers

 - Fixes for stacked device atomic write support

 - Refactor queue affinity helpers, in preparation for better supporting
   isolated CPUs

 - Cleanups of loop O_DIRECT handling

 - Cleanup of BLK_MQ_F_* flags

 - Add rotational support for null_blk

 - Various fixes and cleanups

* tag 'for-6.14/block-20250118' of git://git.kernel.dk/linux: (106 commits)
  block: Don't trim an atomic write
  block: Add common atomic writes enable flag
  md/md-linear: Fix a NULL vs IS_ERR() bug in linear_add()
  block: limit disk max sectors to (LLONG_MAX >> 9)
  block: Change blk_stack_atomic_writes_limits() unit_min check
  block: Ensure start sector is aligned for stacking atomic writes
  blk-mq: Move more error handling into blk_mq_submit_bio()
  block: Reorder the request allocation code in blk_mq_submit_bio()
  nvme: fix bogus kzalloc() return check in nvme_init_effects_log()
  md/md-bitmap: move bitmap_{start, end}write to md upper layer
  md/raid5: implement pers->bitmap_sector()
  md: add a new callback pers->bitmap_sector()
  md/md-bitmap: remove the last parameter for bimtap_ops->endwrite()
  md/md-bitmap: factor behind write counters out from bitmap_{start/end}write()
  md: Replace deprecated kmap_atomic() with kmap_local_page()
  md: reintroduce md-linear
  partitions: ldm: remove the initial kernel-doc notation
  blk-cgroup: rwstat: fix kernel-doc warnings in header file
  blk-cgroup: fix kernel-doc warnings in header file
  nbd: fix partial sending
  ...
---

1cbfb828e05171ca2dd77b5988d068e6872480fe
diff --cc drivers/md/dm-verity-fec.c
index e61855da6461a,b0ee199009fc2..0c41949db784b
--- a/drivers/md/dm-verity-fec.c
+++ b/drivers/md/dm-verity-fec.c
@@@ -121,8 -132,7 +121,8 @@@ static int fec_decode_bufs(struct dm_ve
  	u8 *par, *block;
  	struct bio *bio = dm_bio_from_per_bio_data(io, v->ti->per_io_data_size);
  
 -	par = fec_read_parity(v, rsb, block_offset, &offset, &buf, bio->bi_ioprio);
 +	par = fec_read_parity(v, rsb, block_offset, &offset,
- 			      par_buf_offset, &buf, bio_prio(bio));
++			      par_buf_offset, &buf, bio->bi_ioprio);
  	if (IS_ERR(par))
  		return PTR_ERR(par);
  
@@@ -163,8 -160,7 +163,8 @@@
  		if (offset >= v->fec->io_size) {
  			dm_bufio_release(buf);
  
 -			par = fec_read_parity(v, rsb, block_offset, &offset, &buf, bio->bi_ioprio);
 +			par = fec_read_parity(v, rsb, block_offset, &offset,
- 					      par_buf_offset, &buf, bio_prio(bio));
++					      par_buf_offset, &buf, bio->bi_ioprio);
  			if (IS_ERR(par))
  				return PTR_ERR(par);
  		}
diff --cc drivers/nvme/target/core.c
index fde6c555af619,43c9888eea906..cdc4a09a6e8a4
--- a/drivers/nvme/target/core.c
+++ b/drivers/nvme/target/core.c
@@@ -1407,12 -1490,12 +1508,12 @@@ static void nvmet_setup_p2p_ns_map(stru
  	struct nvmet_ns *ns;
  	unsigned long idx;
  
- 	if (!req->p2p_client)
+ 	if (!p2p_client)
  		return;
  
- 	ctrl->p2p_client = get_device(req->p2p_client);
+ 	ctrl->p2p_client = get_device(p2p_client);
  
 -	xa_for_each(&ctrl->subsys->namespaces, idx, ns)
 +	nvmet_for_each_enabled_ns(&ctrl->subsys->namespaces, idx, ns)
  		nvmet_p2pmem_ns_add_p2p(ctrl, ns);
  }