ublk: cleanup for supporting batch IO command

[blktests-ci]

Pull request for series with
subject: ublk: cleanup for supporting batch IO command
version: 2
url: https://patchwork.kernel.org/project/linux-block/list/?series=979847

[blktests-ci]

Upstream branch: f4ca523
series: https://patchwork.kernel.org/project/linux-block/list/?series=979847
version: 2

[blktests-ci]

Upstream branch: 232ed3c
series: https://patchwork.kernel.org/project/linux-block/list/?series=979847
version: 2

[blktests-ci]

Upstream branch: 232ed3c
series: https://patchwork.kernel.org/project/linux-block/list/?series=979847
version: 2

[blktests-ci]

Upstream branch: 232ed3c
series: https://patchwork.kernel.org/project/linux-block/list/?series=979847
version: 2

[blktests-ci]

Upstream branch: d7d3914
series: https://patchwork.kernel.org/project/linux-block/list/?series=979847
version: 2

[blktests-ci]

Upstream branch: 5d41d21
series: https://patchwork.kernel.org/project/linux-block/list/?series=981821
version: 3

[blktests-ci]

Upstream branch: a8fa173
series: https://patchwork.kernel.org/project/linux-block/list/?series=981821
version: 3

Pull request is NOT updated. Failed to apply https://patchwork.kernel.org/project/linux-block/list/?series=981821
error message:

Cmd('git') failed due to: exit code(128)
  cmdline: git am --3way
  stdout: 'Applying: ublk: validate ublk server pid
Using index info to reconstruct a base tree...
M	drivers/block/ublk_drv.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/block/ublk_drv.c
No changes -- Patch already applied.
Applying: ublk: look up ublk task via its pid in timeout handler
Using index info to reconstruct a base tree...
M	drivers/block/ublk_drv.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/block/ublk_drv.c
No changes -- Patch already applied.
Applying: ublk: move fake timeout logic into __ublk_complete_rq()
Using index info to reconstruct a base tree...
M	drivers/block/ublk_drv.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/block/ublk_drv.c
CONFLICT (content): Merge conflict in drivers/block/ublk_drv.c
Patch failed at 0003 ublk: move fake timeout logic into __ublk_complete_rq()'
  stderr: 'error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"'

conflict:

diff --cc drivers/block/ublk_drv.c
index 6561d2a561fa,73c6c8d3b117..000000000000
--- a/drivers/block/ublk_drv.c
+++ b/drivers/block/ublk_drv.c
@@@ -2240,15 -2203,45 +2240,52 @@@ static int ublk_check_commit_and_fetch(
  		return -EINVAL;
  	}
  
++<<<<<<< HEAD
 +	return 0;
 +}
 +
 +static bool ublk_need_complete_req(const struct ublk_queue *ubq,
 +				   struct ublk_io *io)
 +{
++=======
+ 	if (ublk_support_auto_buf_reg(ubq)) {
+ 		int ret;
+ 
+ 		/*
+ 		 * `UBLK_F_AUTO_BUF_REG` only works iff `UBLK_IO_FETCH_REQ`
+ 		 * and `UBLK_IO_COMMIT_AND_FETCH_REQ` are issued from same
+ 		 * `io_ring_ctx`.
+ 		 *
+ 		 * If this uring_cmd's io_ring_ctx isn't same with the
+ 		 * one for registering the buffer, it is ublk server's
+ 		 * responsibility for unregistering the buffer, otherwise
+ 		 * this ublk request gets stuck.
+ 		 */
+ 		if (io->flags & UBLK_IO_FLAG_AUTO_BUF_REG) {
+ 			if (io->buf_ctx_handle == io_uring_cmd_ctx_handle(cmd))
+ 				io_buffer_unregister_bvec(cmd, io->buf_index,
+ 						issue_flags);
+ 			io->flags &= ~UBLK_IO_FLAG_AUTO_BUF_REG;
+ 		}
+ 
+ 		ret = ublk_set_auto_buf_reg(cmd);
+ 		if (ret)
+ 			return ret;
+ 	}
+ 
+ 	ublk_fill_io_cmd(io, cmd, ub_cmd->addr);
+ 
+ 	/* now this cmd slot is owned by ublk driver */
+ 	io->flags &= ~UBLK_IO_FLAG_OWNED_BY_SRV;
+ 	io->res = ub_cmd->result;
+ 
+ 	if (req_op(req) == REQ_OP_ZONE_APPEND)
+ 		req->__sector = ub_cmd->zone_append_lba;
+ 
++>>>>>>> ublk: move fake timeout logic into __ublk_complete_rq()
  	if (ublk_need_req_ref(ubq))
 -		ublk_sub_req_ref(io, req);
 -	else
 -		__ublk_complete_rq(req);
 -	return 0;
 +		return ublk_sub_req_ref(io);
 +	return true;
  }
  
  static bool ublk_get_data(const struct ublk_queue *ubq, struct ublk_io *io,