From: Jens Axboe <axboe@kernel.dk>
Date: Fri, 17 Feb 2023 02:42:10 +0000 (-0700)
Subject: Merge branch 'for-6.3/block' into for-6.3/block-merged
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=refs%2Fheads%2Ffor-6.3%2Fblock-merged;p=linux-2.6-block.git

Merge branch 'for-6.3/block' into for-6.3/block-merged

* for-6.3/block: (168 commits)
  block: use proper return value from bio_failfast()
  block: bio-integrity: Copy flags when bio_integrity_payload is cloned
  block: Fix io statistics for cgroup in throttle path
  brd: mark as nowait compatible
  brd: check for REQ_NOWAIT and set correct page allocation mask
  brd: return 0/-error from brd_insert_page()
  block: sync mixed merged request's failfast with 1st bio's
  Revert "blk-cgroup: pin the gendisk in struct blkcg_gq"
  Revert "blk-cgroup: pass a gendisk to blkg_lookup"
  Revert "blk-cgroup: delay blk-cgroup initialization until add_disk"
  Revert "blk-cgroup: delay calling blkcg_exit_disk until disk_release"
  Revert "blk-cgroup: move the cgroup information to struct gendisk"
  nvme-pci: remove iod use_sgls
  nvme-pci: fix freeing single sgl
  block: ublk: check IO buffer based on flag need_get_data
  s390/dasd: Fix potential memleak in dasd_eckd_init()
  s390/dasd: sort out physical vs virtual pointers usage
  block: Remove the ALLOC_CACHE_SLACK constant
  block: make kobj_type structures constant
  block: Merge bio before checking ->cached_rq
  ...

Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

7131055c127f10641eed49ac8c71bcee91180f31
diff --cc block/bfq-iosched.c
index 380e9bda2e57,777dcab73c8e..8a8d4441519c
--- a/block/bfq-iosched.c
+++ b/block/bfq-iosched.c
@@@ -5423,16 -5568,14 +5568,16 @@@ static void bfq_check_ioprio_change(str
  
  	bic->ioprio = ioprio;
  
- 	bfqq = bic_to_bfqq(bic, false);
+ 	bfqq = bic_to_bfqq(bic, false, bfq_actuator_index(bfqd, bio));
  	if (bfqq) {
 -		bfq_release_process_ref(bfqd, bfqq);
 +		struct bfq_queue *old_bfqq = bfqq;
 +
  		bfqq = bfq_get_queue(bfqd, bio, false, bic, true);
- 		bic_set_bfqq(bic, bfqq, false);
+ 		bic_set_bfqq(bic, bfqq, false, bfq_actuator_index(bfqd, bio));
 +		bfq_release_process_ref(bfqd, old_bfqq);
  	}
  
- 	bfqq = bic_to_bfqq(bic, true);
+ 	bfqq = bic_to_bfqq(bic, true, bfq_actuator_index(bfqd, bio));
  	if (bfqq)
  		bfq_set_next_ioprio_data(bfqq, bic);
  }
diff --cc fs/coredump.c
index a25ecec9ca7c,0a6873a9c4d0..685d77bfd935
--- a/fs/coredump.c
+++ b/fs/coredump.c
@@@ -838,37 -838,9 +838,33 @@@ static int __dump_skip(struct coredump_
  	}
  }
  
 +int dump_emit(struct coredump_params *cprm, const void *addr, int nr)
 +{
 +	if (cprm->to_skip) {
 +		if (!__dump_skip(cprm, cprm->to_skip))
 +			return 0;
 +		cprm->to_skip = 0;
 +	}
 +	return __dump_emit(cprm, addr, nr);
 +}
 +EXPORT_SYMBOL(dump_emit);
 +
 +void dump_skip_to(struct coredump_params *cprm, unsigned long pos)
 +{
 +	cprm->to_skip = pos - cprm->pos;
 +}
 +EXPORT_SYMBOL(dump_skip_to);
 +
 +void dump_skip(struct coredump_params *cprm, size_t nr)
 +{
 +	cprm->to_skip += nr;
 +}
 +EXPORT_SYMBOL(dump_skip);
 +
 +#ifdef CONFIG_ELF_CORE
  static int dump_emit_page(struct coredump_params *cprm, struct page *page)
  {
- 	struct bio_vec bvec = {
- 		.bv_page	= page,
- 		.bv_offset	= 0,
- 		.bv_len		= PAGE_SIZE,
- 	};
+ 	struct bio_vec bvec;
  	struct iov_iter iter;
  	struct file *file = cprm->file;
  	loff_t pos;