Messages in this thread | | | Date | Fri, 30 Jun 2023 16:03:58 +0530 | From | aravind.ramesh@opensour ... | Subject | Re: [PATCH v4 2/4] ublk: move types to shared header file |
| |
> From: Andreas Hindborg <a.hindborg@samsung.com > <mailto:a.hindborg@samsung.com>> > > > This change is in preparation for ublk zoned storage support. > > > Signed-off-by: Andreas Hindborg <a.hindborg@samsung.com > <mailto:a.hindborg@samsung.com>> > --- > MAINTAINERS | 1 + > drivers/block/ublk_drv.c | 45 +------------------------------- > drivers/block/ublk_drv.h | 55 ++++++++++++++++++++++++++++++++++++++++ > 3 files changed, 57 insertions(+), 44 deletions(-) > create mode 100644 drivers/block/ublk_drv.h > > > diff --git a/MAINTAINERS b/MAINTAINERS > index 27ef11624748..ace71c90751c 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -21554,6 +21554,7 @@ L: linux-block@vger.kernel.org > <mailto:linux-block@vger.kernel.org> > S: Maintained > F: Documentation/block/ublk.rst > F: drivers/block/ublk_drv.c > +F: drivers/block/ublk_drv.h > F: include/uapi/linux/ublk_cmd.h > > > UCLINUX (M68KNOMMU AND COLDFIRE) > diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c > index 1c823750c95a..e519dc0d9fe7 100644 > --- a/drivers/block/ublk_drv.c > +++ b/drivers/block/ublk_drv.c > @@ -45,6 +45,7 @@ > #include <linux/namei.h> > #include <linux/kref.h> > #include <uapi/linux/ublk_cmd.h> > +#include "ublk_drv.h" > > > #define UBLK_MINORS (1U << MINORBITS) > > > @@ -62,11 +63,6 @@ > #define UBLK_PARAM_TYPE_ALL (UBLK_PARAM_TYPE_BASIC | \ > UBLK_PARAM_TYPE_DISCARD | UBLK_PARAM_TYPE_DEVT) > > > -struct ublk_rq_data { > - struct llist_node node; > - > - struct kref ref; > -}; > > > struct ublk_uring_cmd_pdu { > struct ublk_queue *ubq; > @@ -140,45 +136,6 @@ struct ublk_queue { > > > #define UBLK_DAEMON_MONITOR_PERIOD (5 * HZ) > > > -struct ublk_device { > - struct gendisk *ub_disk; > - > - char *__queues; > - > - unsigned int queue_size; > - struct ublksrv_ctrl_dev_info dev_info; > - > - struct blk_mq_tag_set tag_set; > - > - struct cdev cdev; > - struct device cdev_dev; > - > -#define UB_STATE_OPEN 0 > -#define UB_STATE_USED 1 > -#define UB_STATE_DELETED 2 > - unsigned long state; > - int ub_number; > - > - struct mutex mutex; > - > - spinlock_t mm_lock; > - struct mm_struct *mm; > - > - struct ublk_params params; > - > - struct completion completion; > - unsigned int nr_queues_ready; > - unsigned int nr_privileged_daemon; > - > - /* > - * Our ubq->daemon may be killed without any notification, so > - * monitor each queue's daemon periodically > - */ > - struct delayed_work monitor_work; > - struct work_struct quiesce_work; > - struct work_struct stop_work; > -}; > - > /* header of ublk_params */ > struct ublk_params_header { > __u32 len; > diff --git a/drivers/block/ublk_drv.h b/drivers/block/ublk_drv.h > new file mode 100644 > index 000000000000..f81e62256456 > --- /dev/null > +++ b/drivers/block/ublk_drv.h > @@ -0,0 +1,55 @@ > +/* SPDX-License-Identifier: GPL-2.0 */ > + > +#ifndef _UBLK_DRV_H > +#define _UBLK_DRV_H > + > +#include <uapi/linux/ublk_cmd.h> > +#include <linux/blk-mq.h> > +#include <linux/cdev.h> > + > +struct ublk_device { > + struct gendisk *ub_disk; > + > + char *__queues; > + > + unsigned int queue_size; > + struct ublksrv_ctrl_dev_info dev_info; > + > + struct blk_mq_tag_set tag_set; > + > + struct cdev cdev; > + struct device cdev_dev; > + > +#define UB_STATE_OPEN 0 > +#define UB_STATE_USED 1 > +#define UB_STATE_DELETED 2 > + unsigned long state; > + int ub_number; > + > + struct mutex mutex; > + > + spinlock_t mm_lock; > + struct mm_struct *mm; > + > + struct ublk_params params; > + > + struct completion completion; > + unsigned int nr_queues_ready; > + unsigned int nr_privileged_daemon; > + > + /* > + * Our ubq->daemon may be killed without any notification, so > + * monitor each queue's daemon periodically > + */ > + struct delayed_work monitor_work; > + struct work_struct quiesce_work; > + struct work_struct stop_work; > +}; > + > +struct ublk_rq_data { > + struct llist_node node; > + > + struct kref ref; > +}; > + > +#endif
LGTM
Regards, Aravind
| |