From: Eric Biggers <ebiggers@google.com>

The use of the term "glue" in filenames is a Crypto API-ism that does
not show up elsewhere in lib/.  I think adopting it there was a mistake.
The library just uses standard functions, so the amount of code that
could be considered "glue" is quite small.  And while often the C
functions just wrap the assembly functions, there are also cases like
crc32c_arch() in arch/x86/lib/crc32-glue.c that blur the line by
in-lining the actual implementation into the C function.  That's not
"glue code", but rather the actual code.

Therefore, let's drop "glue" from the filenames and instead use e.g.
crc32.c instead of crc32-glue.c.

Signed-off-by: Eric Biggers <ebiggers@google.com>
---
 arch/s390/lib/Makefile                  | 2 +-
 arch/s390/lib/{crc32-glue.c => crc32.c} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename arch/s390/lib/{crc32-glue.c => crc32.c} (100%)

diff --git a/arch/s390/lib/Makefile b/arch/s390/lib/Makefile
index 14bbfe50033c7..271a1c407121c 100644
--- a/arch/s390/lib/Makefile
+++ b/arch/s390/lib/Makefile
@@ -24,6 +24,6 @@ obj-$(CONFIG_S390_MODULES_SANITY_TEST_HELPERS) += test_modules_helpers.o
 lib-$(CONFIG_FUNCTION_ERROR_INJECTION) += error-inject.o
 
 obj-$(CONFIG_EXPOLINE_EXTERN) += expoline.o
 
 obj-$(CONFIG_CRC32_ARCH) += crc32-s390.o
-crc32-s390-y := crc32-glue.o crc32le-vx.o crc32be-vx.o
+crc32-s390-y := crc32.o crc32le-vx.o crc32be-vx.o
diff --git a/arch/s390/lib/crc32-glue.c b/arch/s390/lib/crc32.c
similarity index 100%
rename from arch/s390/lib/crc32-glue.c
rename to arch/s390/lib/crc32.c
-- 
2.49.0

On Wed, Apr 23, 2025 at 05:20:36PM -0700, Eric Biggers wrote:
> From: Eric Biggers <ebiggers@google.com>
> 
> The use of the term "glue" in filenames is a Crypto API-ism that does
> not show up elsewhere in lib/.  I think adopting it there was a mistake.
> The library just uses standard functions, so the amount of code that
> could be considered "glue" is quite small.  And while often the C
> functions just wrap the assembly functions, there are also cases like
> crc32c_arch() in arch/x86/lib/crc32-glue.c that blur the line by
> in-lining the actual implementation into the C function.  That's not
> "glue code", but rather the actual code.
> 
> Therefore, let's drop "glue" from the filenames and instead use e.g.
> crc32.c instead of crc32-glue.c.
> 
> Signed-off-by: Eric Biggers <ebiggers@google.com>
> ---
>  arch/s390/lib/Makefile                  | 2 +-
>  arch/s390/lib/{crc32-glue.c => crc32.c} | 0
>  2 files changed, 1 insertion(+), 1 deletion(-)
>  rename arch/s390/lib/{crc32-glue.c => crc32.c} (100%)

Acked-by: Heiko Carstens <hca@linux.ibm.com>