Re: [PATCH] zlib: move EXPORT_SYMBOL() and MODULE_LICENSE() out of dfltcc_syms.c

[Christian Borntraeger]

On 19.12.20 06:25, Randy Dunlap wrote:
> In 11fb479ff5d9 ("zlib: export S390 symbols for zlib modules"), I added
> EXPORT_SYMBOL()s to dfltcc_inflate.c but then Mikhail said that these
> should probably be in dfltcc_syms.c with the other EXPORT_SYMBOL()s.
> 
> However, that is contrary to the current kernel style, which places
> EXPORT_SYMBOL() immediately after the function that it applies to,
> so move all EXPORT_SYMBOL()s to their respective function locations
> and drop the dfltcc_syms.c file. Also move MODULE_LICENSE() from the
> deleted file to dfltcc.c.
> 
> Fixes: 11fb479ff5d9 ("zlib: export S390 symbols for zlib modules")
> Signed-off-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx>
> Cc: Zaslonko Mikhail <zaslonko@xxxxxxxxxxxxx>
> Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
> Cc: Acked-by: Ilya Leoshkevich <iii@xxxxxxxxxxxxx>
> Cc: Heiko Carstens <hca@xxxxxxxxxxxxx>
> Cc: Vasily Gorbik <gor@xxxxxxxxxxxxx>
> Cc: Christian Borntraeger <borntraeger@xxxxxxxxxx>

Makes sense
I see that Andrew has already picked this up, in case this helps

Acked-by: Christian Borntraeger <borntraeger@xxxxxxxxxx>
> ---
>  lib/zlib_dfltcc/dfltcc.c         |    6 +++++-
>  lib/zlib_dfltcc/dfltcc_deflate.c |    3 +++
>  lib/zlib_dfltcc/dfltcc_syms.c    |   17 -----------------
>  3 files changed, 8 insertions(+), 18 deletions(-)
> 
> --- linux-next-20201218.orig/lib/zlib_dfltcc/dfltcc.c
> +++ linux-next-20201218/lib/zlib_dfltcc/dfltcc.c
> @@ -1,7 +1,8 @@
>  // SPDX-License-Identifier: Zlib
>  /* dfltcc.c - SystemZ DEFLATE CONVERSION CALL support. */
>  
> -#include <linux/zutil.h>
> +#include <linux/export.h>
> +#include <linux/module.h>
>  #include "dfltcc_util.h"
>  #include "dfltcc.h"
>  
> @@ -53,3 +54,6 @@ void dfltcc_reset(
>      dfltcc_state->dht_threshold = DFLTCC_DHT_MIN_SAMPLE_SIZE;
>      dfltcc_state->param.ribm = DFLTCC_RIBM;
>  }
> +EXPORT_SYMBOL(dfltcc_reset);
> +
> +MODULE_LICENSE("GPL");
> --- linux-next-20201218.orig/lib/zlib_dfltcc/dfltcc_deflate.c
> +++ linux-next-20201218/lib/zlib_dfltcc/dfltcc_deflate.c
> @@ -4,6 +4,7 @@
>  #include "dfltcc_util.h"
>  #include "dfltcc.h"
>  #include <asm/setup.h>
> +#include <linux/export.h>
>  #include <linux/zutil.h>
>  
>  /*
> @@ -34,6 +35,7 @@ int dfltcc_can_deflate(
>  
>      return 1;
>  }
> +EXPORT_SYMBOL(dfltcc_can_deflate);
>  
>  static void dfltcc_gdht(
>      z_streamp strm
> @@ -277,3 +279,4 @@ again:
>          goto again; /* deflate() must use all input or all output */
>      return 1;
>  }
> +EXPORT_SYMBOL(dfltcc_deflate);
> --- linux-next-20201218.orig/lib/zlib_dfltcc/dfltcc_syms.c
> +++ /dev/null
> @@ -1,17 +0,0 @@
> -// SPDX-License-Identifier: GPL-2.0-only
> -/*
> - * linux/lib/zlib_dfltcc/dfltcc_syms.c
> - *
> - * Exported symbols for the s390 zlib dfltcc support.
> - *
> - */
> -
> -#include <linux/init.h>
> -#include <linux/module.h>
> -#include <linux/zlib.h>
> -#include "dfltcc.h"
> -
> -EXPORT_SYMBOL(dfltcc_can_deflate);
> -EXPORT_SYMBOL(dfltcc_deflate);
> -EXPORT_SYMBOL(dfltcc_reset);
> -MODULE_LICENSE("GPL");
>