Linux-Block Archive on lore.kernel.org
 help / color / Atom feed
* [PATCH] block: Remove callback typedefs for blk_mq_ops
@ 2020-07-28 16:05 Daniel Wagner
  2020-07-28 16:13 ` Jens Axboe
  0 siblings, 1 reply; 3+ messages in thread
From: Daniel Wagner @ 2020-07-28 16:05 UTC (permalink / raw)
  To: Jens Axboe; +Cc: linux-block, linux-kernel, Daniel Wagner

No need to define typedefs for the callbacks, because there is not a
single user except blk_mq_ops.

Signed-off-by: Daniel Wagner <dwagner@suse.de>
---
 include/linux/blk-mq.h | 56 ++++++++++++++++++++------------------------------
 1 file changed, 22 insertions(+), 34 deletions(-)

diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h
index 23230c1d031e..d558f6104278 100644
--- a/include/linux/blk-mq.h
+++ b/include/linux/blk-mq.h
@@ -267,27 +267,9 @@ struct blk_mq_queue_data {
 	bool last;
 };
 
-typedef blk_status_t (queue_rq_fn)(struct blk_mq_hw_ctx *,
-		const struct blk_mq_queue_data *);
-typedef void (commit_rqs_fn)(struct blk_mq_hw_ctx *);
-typedef bool (get_budget_fn)(struct request_queue *);
-typedef void (put_budget_fn)(struct request_queue *);
-typedef enum blk_eh_timer_return (timeout_fn)(struct request *, bool);
-typedef int (init_hctx_fn)(struct blk_mq_hw_ctx *, void *, unsigned int);
-typedef void (exit_hctx_fn)(struct blk_mq_hw_ctx *, unsigned int);
-typedef int (init_request_fn)(struct blk_mq_tag_set *set, struct request *,
-		unsigned int, unsigned int);
-typedef void (exit_request_fn)(struct blk_mq_tag_set *set, struct request *,
-		unsigned int);
-
 typedef bool (busy_iter_fn)(struct blk_mq_hw_ctx *, struct request *, void *,
 		bool);
 typedef bool (busy_tag_iter_fn)(struct request *, void *, bool);
-typedef int (poll_fn)(struct blk_mq_hw_ctx *);
-typedef int (map_queues_fn)(struct blk_mq_tag_set *set);
-typedef bool (busy_fn)(struct request_queue *);
-typedef void (complete_fn)(struct request *);
-typedef void (cleanup_rq_fn)(struct request *);
 
 /**
  * struct blk_mq_ops - Callback functions that implements block driver
@@ -297,7 +279,8 @@ struct blk_mq_ops {
 	/**
 	 * @queue_rq: Queue a new request from block IO.
 	 */
-	queue_rq_fn		*queue_rq;
+	blk_status_t (*queue_rq)(struct blk_mq_hw_ctx *,
+				 const struct blk_mq_queue_data *);
 
 	/**
 	 * @commit_rqs: If a driver uses bd->last to judge when to submit
@@ -306,7 +289,7 @@ struct blk_mq_ops {
 	 * purpose of kicking the hardware (which the last request otherwise
 	 * would have done).
 	 */
-	commit_rqs_fn		*commit_rqs;
+	void	(*commit_rqs)(struct blk_mq_hw_ctx *);
 
 	/**
 	 * @get_budget: Reserve budget before queue request, once .queue_rq is
@@ -314,37 +297,39 @@ struct blk_mq_ops {
 	 * reserved budget. Also we have to handle failure case
 	 * of .get_budget for avoiding I/O deadlock.
 	 */
-	get_budget_fn		*get_budget;
+	bool	(*get_budget)(struct request_queue *);
+
 	/**
 	 * @put_budget: Release the reserved budget.
 	 */
-	put_budget_fn		*put_budget;
+	void	(*put_budget)(struct request_queue *);
 
 	/**
 	 * @timeout: Called on request timeout.
 	 */
-	timeout_fn		*timeout;
+	enum blk_eh_timer_return (*timeout)(struct request *, bool);
 
 	/**
 	 * @poll: Called to poll for completion of a specific tag.
 	 */
-	poll_fn			*poll;
+	int	(*poll)(struct blk_mq_hw_ctx *);
 
 	/**
 	 * @complete: Mark the request as complete.
 	 */
-	complete_fn		*complete;
+	void	(*complete)(struct request *);
 
 	/**
 	 * @init_hctx: Called when the block layer side of a hardware queue has
 	 * been set up, allowing the driver to allocate/init matching
 	 * structures.
 	 */
-	init_hctx_fn		*init_hctx;
+	int	(*init_hctx)(struct blk_mq_hw_ctx *, void *, unsigned int);
+
 	/**
 	 * @exit_hctx: Ditto for exit/teardown.
 	 */
-	exit_hctx_fn		*exit_hctx;
+	void	(*exit_hctx)(struct blk_mq_hw_ctx *, unsigned int);
 
 	/**
 	 * @init_request: Called for every command allocated by the block layer
@@ -353,40 +338,43 @@ struct blk_mq_ops {
 	 * Tag greater than or equal to queue_depth is for setting up
 	 * flush request.
 	 */
-	init_request_fn		*init_request;
+	int	(*init_request)(struct blk_mq_tag_set *set, struct request *,
+				unsigned int, unsigned int);
+
 	/**
 	 * @exit_request: Ditto for exit/teardown.
 	 */
-	exit_request_fn		*exit_request;
+	void	(*exit_request)(struct blk_mq_tag_set *set, struct request *,
+				unsigned int);
 
 	/**
 	 * @initialize_rq_fn: Called from inside blk_get_request().
 	 */
-	void (*initialize_rq_fn)(struct request *rq);
+	void	(*initialize_rq_fn)(struct request *rq);
 
 	/**
 	 * @cleanup_rq: Called before freeing one request which isn't completed
 	 * yet, and usually for freeing the driver private data.
 	 */
-	cleanup_rq_fn		*cleanup_rq;
+	void	(*cleanup_rq)(struct request *);
 
 	/**
 	 * @busy: If set, returns whether or not this queue currently is busy.
 	 */
-	busy_fn			*busy;
+	bool	(*busy)(struct request_queue *);
 
 	/**
 	 * @map_queues: This allows drivers specify their own queue mapping by
 	 * overriding the setup-time function that builds the mq_map.
 	 */
-	map_queues_fn		*map_queues;
+	int	(*map_queues)(struct blk_mq_tag_set *set);
 
 #ifdef CONFIG_BLK_DEBUG_FS
 	/**
 	 * @show_rq: Used by the debugfs implementation to show driver-specific
 	 * information about a request.
 	 */
-	void (*show_rq)(struct seq_file *m, struct request *rq);
+	void	(*show_rq)(struct seq_file *m, struct request *rq);
 #endif
 };
 
-- 
2.16.4


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] block: Remove callback typedefs for blk_mq_ops
  2020-07-28 16:05 [PATCH] block: Remove callback typedefs for blk_mq_ops Daniel Wagner
@ 2020-07-28 16:13 ` Jens Axboe
  2020-07-28 16:15   ` Daniel Wagner
  0 siblings, 1 reply; 3+ messages in thread
From: Jens Axboe @ 2020-07-28 16:13 UTC (permalink / raw)
  To: Daniel Wagner; +Cc: linux-block, linux-kernel

On 7/28/20 10:05 AM, Daniel Wagner wrote:
> No need to define typedefs for the callbacks, because there is not a
> single user except blk_mq_ops.

Concept looks fine to me, but you're mixing indentations a bit. Just
remove the indentation bits, we don't need them here.

-- 
Jens Axboe


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] block: Remove callback typedefs for blk_mq_ops
  2020-07-28 16:13 ` Jens Axboe
@ 2020-07-28 16:15   ` Daniel Wagner
  0 siblings, 0 replies; 3+ messages in thread
From: Daniel Wagner @ 2020-07-28 16:15 UTC (permalink / raw)
  To: Jens Axboe; +Cc: linux-block, linux-kernel

On Tue, Jul 28, 2020 at 10:13:06AM -0600, Jens Axboe wrote:
> On 7/28/20 10:05 AM, Daniel Wagner wrote:
> > No need to define typedefs for the callbacks, because there is not a
> > single user except blk_mq_ops.
> 
> Concept looks fine to me, but you're mixing indentations a bit. Just
> remove the indentation bits, we don't need them here.

Ok, in fact I was not sure about the indentation. Let me respin it.

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, back to index

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-28 16:05 [PATCH] block: Remove callback typedefs for blk_mq_ops Daniel Wagner
2020-07-28 16:13 ` Jens Axboe
2020-07-28 16:15   ` Daniel Wagner

Linux-Block Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-block/0 linux-block/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-block linux-block/ https://lore.kernel.org/linux-block \
		linux-block@vger.kernel.org
	public-inbox-index linux-block

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-block


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git