mbox series

[v5,0/4] dedupe smb unicode files

Message ID 20230817002232.80079-1-linux@treblig.org (mailing list archive)
Headers show
Series dedupe smb unicode files | expand

Message

Dr. David Alan Gilbert Aug. 17, 2023, 12:22 a.m. UTC
From: "Dr. David Alan Gilbert" <dave@treblig.org>

The smb client and server code have (mostly) duplicated code
for unicode manipulation, in particular upper case handling.

Flatten this lot into shared code.

There's some code that's slightly different between the two, and
I've not attempted to share that - this should be strictly a no
behaviour change set.

In addition, the same tables and code are shared in jfs, however
there's very little testing available for the unicode in there,
so just share the raw data tables.

I suspect there's more UCS-2 code that can be shared, in the NLS code
and in the UCS-2 code used by the EFI interfaces.

Lightly tested with a module and a monolithic build, and just mounting
itself.

This dupe was found using PMD:
  https://pmd.github.io/pmd/pmd_userdocs_cpd.html

Dave

Version 5
  Add some (wchar_t *) casts to keep sparse
  happy, as spotted by kernel test robot

Dr. David Alan Gilbert (4):
  fs/smb: Remove unicode 'lower' tables
  fs/smb: Swing unicode common code from smb->NLS
  fs/smb/client: Use common code in client
  fs/jfs: Use common ucs2 upper case table

 fs/jfs/Kconfig                                |   1 +
 fs/jfs/Makefile                               |   2 +-
 fs/jfs/jfs_unicode.h                          |  17 +-
 fs/jfs/jfs_uniupr.c                           | 121 -------
 fs/nls/Kconfig                                |   8 +
 fs/nls/Makefile                               |   1 +
 fs/nls/nls_ucs2_data.h                        |  15 +
 .../server/uniupr.h => nls/nls_ucs2_utils.c}  | 156 +--------
 fs/nls/nls_ucs2_utils.h                       | 285 +++++++++++++++
 fs/smb/client/Kconfig                         |   1 +
 fs/smb/client/cifs_unicode.c                  |   1 -
 fs/smb/client/cifs_unicode.h                  | 330 +-----------------
 fs/smb/client/cifs_uniupr.h                   | 239 -------------
 fs/smb/client/smb2pdu.c                       |   4 +-
 fs/smb/server/Kconfig                         |   1 +
 fs/smb/server/unicode.c                       |   1 -
 fs/smb/server/unicode.h                       | 325 +----------------
 17 files changed, 342 insertions(+), 1166 deletions(-)
 delete mode 100644 fs/jfs/jfs_uniupr.c
 create mode 100644 fs/nls/nls_ucs2_data.h
 rename fs/{smb/server/uniupr.h => nls/nls_ucs2_utils.c} (50%)
 create mode 100644 fs/nls/nls_ucs2_utils.h
 delete mode 100644 fs/smb/client/cifs_uniupr.h

Comments

Steve French Aug. 19, 2023, 4:35 a.m. UTC | #1
tentatively merged to cifs-2.6.git for-next pending additional testing

Let me know if anyone wants to add RB or Acked-by to any of these or
spots any issues

On Wed, Aug 16, 2023 at 7:22 PM <linux@treblig.org> wrote:
>
> From: "Dr. David Alan Gilbert" <dave@treblig.org>
>
> The smb client and server code have (mostly) duplicated code
> for unicode manipulation, in particular upper case handling.
>
> Flatten this lot into shared code.
>
> There's some code that's slightly different between the two, and
> I've not attempted to share that - this should be strictly a no
> behaviour change set.
>
> In addition, the same tables and code are shared in jfs, however
> there's very little testing available for the unicode in there,
> so just share the raw data tables.
>
> I suspect there's more UCS-2 code that can be shared, in the NLS code
> and in the UCS-2 code used by the EFI interfaces.
>
> Lightly tested with a module and a monolithic build, and just mounting
> itself.
>
> This dupe was found using PMD:
>   https://pmd.github.io/pmd/pmd_userdocs_cpd.html
>
> Dave
>
> Version 5
>   Add some (wchar_t *) casts to keep sparse
>   happy, as spotted by kernel test robot
>
> Dr. David Alan Gilbert (4):
>   fs/smb: Remove unicode 'lower' tables
>   fs/smb: Swing unicode common code from smb->NLS
>   fs/smb/client: Use common code in client
>   fs/jfs: Use common ucs2 upper case table
>
>  fs/jfs/Kconfig                                |   1 +
>  fs/jfs/Makefile                               |   2 +-
>  fs/jfs/jfs_unicode.h                          |  17 +-
>  fs/jfs/jfs_uniupr.c                           | 121 -------
>  fs/nls/Kconfig                                |   8 +
>  fs/nls/Makefile                               |   1 +
>  fs/nls/nls_ucs2_data.h                        |  15 +
>  .../server/uniupr.h => nls/nls_ucs2_utils.c}  | 156 +--------
>  fs/nls/nls_ucs2_utils.h                       | 285 +++++++++++++++
>  fs/smb/client/Kconfig                         |   1 +
>  fs/smb/client/cifs_unicode.c                  |   1 -
>  fs/smb/client/cifs_unicode.h                  | 330 +-----------------
>  fs/smb/client/cifs_uniupr.h                   | 239 -------------
>  fs/smb/client/smb2pdu.c                       |   4 +-
>  fs/smb/server/Kconfig                         |   1 +
>  fs/smb/server/unicode.c                       |   1 -
>  fs/smb/server/unicode.h                       | 325 +----------------
>  17 files changed, 342 insertions(+), 1166 deletions(-)
>  delete mode 100644 fs/jfs/jfs_uniupr.c
>  create mode 100644 fs/nls/nls_ucs2_data.h
>  rename fs/{smb/server/uniupr.h => nls/nls_ucs2_utils.c} (50%)
>  create mode 100644 fs/nls/nls_ucs2_utils.h
>  delete mode 100644 fs/smb/client/cifs_uniupr.h
>
> --
> 2.41.0
>