On 7/5/23 01:52, Andreas Hindborg wrote:
> From: Andreas Hindborg <a.hindborg@xxxxxxxxxxx>
>
> The zoned storage support for ublk adds a translation unit to the module.
> In order to be able to keep the existing name for the module, rename the
> currently only translation unit. Also rename the header to align with the C
> file name.
>
> Signed-off-by: Andreas Hindborg <a.hindborg@xxxxxxxxxxx>
Looks OK, but see my comment on patch 2.
> ---
> MAINTAINERS | 4 ++--
> drivers/block/Makefile | 1 +
> drivers/block/{ublk_drv.c => ublk.c} | 2 +-
> drivers/block/{ublk_drv.h => ublk.h} | 0
> 4 files changed, 4 insertions(+), 3 deletions(-)
> rename drivers/block/{ublk_drv.c => ublk.c} (99%)
> rename drivers/block/{ublk_drv.h => ublk.h} (100%)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index ace71c90751c..1f193cd43958 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -21553,8 +21553,8 @@ M: Ming Lei <ming.lei@xxxxxxxxxx>
> L: linux-block@xxxxxxxxxxxxxxx
> S: Maintained
> F: Documentation/block/ublk.rst
> -F: drivers/block/ublk_drv.c
> -F: drivers/block/ublk_drv.h
> +F: drivers/block/ublk.c
> +F: drivers/block/ublk.h
> F: include/uapi/linux/ublk_cmd.h
>
> UCLINUX (M68KNOMMU AND COLDFIRE)
> diff --git a/drivers/block/Makefile b/drivers/block/Makefile
> index 101612cba303..38f2229623a8 100644
> --- a/drivers/block/Makefile
> +++ b/drivers/block/Makefile
> @@ -38,5 +38,6 @@ obj-$(CONFIG_BLK_DEV_RNBD) += rnbd/
> obj-$(CONFIG_BLK_DEV_NULL_BLK) += null_blk/
>
> obj-$(CONFIG_BLK_DEV_UBLK) += ublk_drv.o
> +ublk_drv-$(CONFIG_BLK_DEV_UBLK) += ublk.o
>
> swim_mod-y := swim.o swim_asm.o
> diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk.c
> similarity index 99%
> rename from drivers/block/ublk_drv.c
> rename to drivers/block/ublk.c
> index bca0c4e1cfd8..a0453619bf67 100644
> --- a/drivers/block/ublk_drv.c
> +++ b/drivers/block/ublk.c
> @@ -45,7 +45,7 @@
> #include <linux/namei.h>
> #include <linux/kref.h>
> #include <uapi/linux/ublk_cmd.h>
> -#include "ublk_drv.h"
> +#include "ublk.h"
>
> #define UBLK_MINORS (1U << MINORBITS)
>
> diff --git a/drivers/block/ublk_drv.h b/drivers/block/ublk.h
> similarity index 100%
> rename from drivers/block/ublk_drv.h
> rename to drivers/block/ublk.h
--
Damien Le Moal
Western Digital Research
