From: "Dr. David Alan Gilbert" <[email protected]>
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.
I'd love to also boil out the same code from fs/jfs/ - but that's
a thought for another time (and harder since there's no good test
for it).
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
Dr. David Alan Gilbert (3):
fs/smb: Remove unicode 'lower' tables
fs/smb: Swing unicode common code from server->common
fs/smb/client: Use common code in client
fs/smb/client/cifs_unicode.c | 1 -
fs/smb/client/cifs_unicode.h | 313 +-----------------
fs/smb/client/cifs_uniupr.h | 239 -------------
fs/smb/common/Makefile | 1 +
.../uniupr.h => common/cifs_unicode_common.c} | 156 +--------
fs/smb/common/cifs_unicode_common.h | 279 ++++++++++++++++
fs/smb/server/unicode.c | 1 -
fs/smb/server/unicode.h | 301 +----------------
8 files changed, 298 insertions(+), 993 deletions(-)
delete mode 100644 fs/smb/client/cifs_uniupr.h
rename fs/smb/{server/uniupr.h => common/cifs_unicode_common.c} (50%)
create mode 100644 fs/smb/common/cifs_unicode_common.h
--
2.41.0
On 6/27/2023 9:14 PM, [email protected] wrote:
> From: "Dr. David Alan Gilbert" <[email protected]>
>
> 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.
>
> I'd love to also boil out the same code from fs/jfs/ - but that's
> a thought for another time (and harder since there's no good test
> for it).
>
> 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
>
> Dr. David Alan Gilbert (3):
> fs/smb: Remove unicode 'lower' tables
> fs/smb: Swing unicode common code from server->common
> fs/smb/client: Use common code in client
>
> fs/smb/client/cifs_unicode.c | 1 -
> fs/smb/client/cifs_unicode.h | 313 +-----------------
> fs/smb/client/cifs_uniupr.h | 239 -------------
> fs/smb/common/Makefile | 1 +
> .../uniupr.h => common/cifs_unicode_common.c} | 156 +--------
> fs/smb/common/cifs_unicode_common.h | 279 ++++++++++++++++
So far so good, but please drop the "cifs_" prefix from this new file's
name, since its contents apply to later smb dialects as well.
Tom.
> fs/smb/server/unicode.c | 1 -
> fs/smb/server/unicode.h | 301 +----------------
> 8 files changed, 298 insertions(+), 993 deletions(-)
> delete mode 100644 fs/smb/client/cifs_uniupr.h
> rename fs/smb/{server/uniupr.h => common/cifs_unicode_common.c} (50%)
> create mode 100644 fs/smb/common/cifs_unicode_common.h
>
* Tom Talpey ([email protected]) wrote:
> On 6/27/2023 9:14 PM, [email protected] wrote:
> > From: "Dr. David Alan Gilbert" <[email protected]>
> >
> > 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.
> >
> > I'd love to also boil out the same code from fs/jfs/ - but that's
> > a thought for another time (and harder since there's no good test
> > for it).
> >
> > 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
> >
> > Dr. David Alan Gilbert (3):
> > fs/smb: Remove unicode 'lower' tables
> > fs/smb: Swing unicode common code from server->common
> > fs/smb/client: Use common code in client
> >
> > fs/smb/client/cifs_unicode.c | 1 -
> > fs/smb/client/cifs_unicode.h | 313 +-----------------
> > fs/smb/client/cifs_uniupr.h | 239 -------------
> > fs/smb/common/Makefile | 1 +
> > .../uniupr.h => common/cifs_unicode_common.c} | 156 +--------
> > fs/smb/common/cifs_unicode_common.h | 279 ++++++++++++++++
>
> So far so good, but please drop the "cifs_" prefix from this new file's
> name, since its contents apply to later smb dialects as well.
Sure.
Dave
> Tom.
>
> > fs/smb/server/unicode.c | 1 -
> > fs/smb/server/unicode.h | 301 +----------------
> > 8 files changed, 298 insertions(+), 993 deletions(-)
> > delete mode 100644 fs/smb/client/cifs_uniupr.h
> > rename fs/smb/{server/uniupr.h => common/cifs_unicode_common.c} (50%)
> > create mode 100644 fs/smb/common/cifs_unicode_common.h
> >
--
-----Open up your eyes, open up your mind, open up your code -------
/ Dr. David Alan Gilbert | Running GNU/Linux | Happy \
\ dave @ treblig.org | | In Hex /
\ _________________________|_____ http://www.treblig.org |_______/
* Dr. David Alan Gilbert ([email protected]) wrote:
> * Tom Talpey ([email protected]) wrote:
> > On 6/27/2023 9:14 PM, [email protected] wrote:
> > > From: "Dr. David Alan Gilbert" <[email protected]>
> > >
> > > 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.
> > >
> > > I'd love to also boil out the same code from fs/jfs/ - but that's
> > > a thought for another time (and harder since there's no good test
> > > for it).
> > >
> > > 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
> > >
> > > Dr. David Alan Gilbert (3):
> > > fs/smb: Remove unicode 'lower' tables
> > > fs/smb: Swing unicode common code from server->common
> > > fs/smb/client: Use common code in client
> > >
> > > fs/smb/client/cifs_unicode.c | 1 -
> > > fs/smb/client/cifs_unicode.h | 313 +-----------------
> > > fs/smb/client/cifs_uniupr.h | 239 -------------
> > > fs/smb/common/Makefile | 1 +
> > > .../uniupr.h => common/cifs_unicode_common.c} | 156 +--------
> > > fs/smb/common/cifs_unicode_common.h | 279 ++++++++++++++++
> >
> > So far so good, but please drop the "cifs_" prefix from this new file's
> > name, since its contents apply to later smb dialects as well.
>
> Sure.
Actually, would you be ok with smb_unicode_common ? The reason is that
you end up with a module named unicode_common that sounds too generic.
Dave
> Dave
>
> > Tom.
> >
> > > fs/smb/server/unicode.c | 1 -
> > > fs/smb/server/unicode.h | 301 +----------------
> > > 8 files changed, 298 insertions(+), 993 deletions(-)
> > > delete mode 100644 fs/smb/client/cifs_uniupr.h
> > > rename fs/smb/{server/uniupr.h => common/cifs_unicode_common.c} (50%)
> > > create mode 100644 fs/smb/common/cifs_unicode_common.h
> > >
> --
> -----Open up your eyes, open up your mind, open up your code -------
> / Dr. David Alan Gilbert | Running GNU/Linux | Happy \
> \ dave @ treblig.org | | In Hex /
> \ _________________________|_____ http://www.treblig.org |_______/
--
-----Open up your eyes, open up your mind, open up your code -------
/ Dr. David Alan Gilbert | Running GNU/Linux | Happy \
\ dave @ treblig.org | | In Hex /
\ _________________________|_____ http://www.treblig.org |_______/
On Wed, Jun 28, 2023 at 8:56 AM Dr. David Alan Gilbert
<[email protected]> wrote:
>
> * Dr. David Alan Gilbert ([email protected]) wrote:
> > * Tom Talpey ([email protected]) wrote:
> > > On 6/27/2023 9:14 PM, [email protected] wrote:
> > > > From: "Dr. David Alan Gilbert" <[email protected]>
> > > >
> > > > 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.
> > > >
> > > > I'd love to also boil out the same code from fs/jfs/ - but that's
> > > > a thought for another time (and harder since there's no good test
> > > > for it).
> > > >
> > > > 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
> > > >
> > > > Dr. David Alan Gilbert (3):
> > > > fs/smb: Remove unicode 'lower' tables
> > > > fs/smb: Swing unicode common code from server->common
> > > > fs/smb/client: Use common code in client
> > > >
> > > > fs/smb/client/cifs_unicode.c | 1 -
> > > > fs/smb/client/cifs_unicode.h | 313 +-----------------
> > > > fs/smb/client/cifs_uniupr.h | 239 -------------
> > > > fs/smb/common/Makefile | 1 +
> > > > .../uniupr.h => common/cifs_unicode_common.c} | 156 +--------
> > > > fs/smb/common/cifs_unicode_common.h | 279 ++++++++++++++++
> > >
> > > So far so good, but please drop the "cifs_" prefix from this new file's
> > > name, since its contents apply to later smb dialects as well.
> >
> > Sure.
>
> Actually, would you be ok with smb_unicode_common ? The reason is that
> you end up with a module named unicode_common that sounds too generic.
Since it is already in the smb/common directory, seems easier to name them:
smb/common/unicode.c
or smb/common/smb_unicode.c
--
Thanks,
Steve
On 6/28/23 8:46AM, Dr. David Alan Gilbert wrote:
> * Dr. David Alan Gilbert ([email protected]) wrote:
>> * Tom Talpey ([email protected]) wrote:
>>> On 6/27/2023 9:14 PM, [email protected] wrote:
>>>> From: "Dr. David Alan Gilbert" <[email protected]>
>>>>
>>>> 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.
>>>>
>>>> I'd love to also boil out the same code from fs/jfs/ - but that's
>>>> a thought for another time (and harder since there's no good test
>>>> for it).
>>>>
>>>> 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
>>>>
>>>> Dr. David Alan Gilbert (3):
>>>> fs/smb: Remove unicode 'lower' tables
>>>> fs/smb: Swing unicode common code from server->common
>>>> fs/smb/client: Use common code in client
>>>>
>>>> fs/smb/client/cifs_unicode.c | 1 -
>>>> fs/smb/client/cifs_unicode.h | 313 +-----------------
>>>> fs/smb/client/cifs_uniupr.h | 239 -------------
>>>> fs/smb/common/Makefile | 1 +
>>>> .../uniupr.h => common/cifs_unicode_common.c} | 156 +--------
>>>> fs/smb/common/cifs_unicode_common.h | 279 ++++++++++++++++
>>>
>>> So far so good, but please drop the "cifs_" prefix from this new file's
>>> name, since its contents apply to later smb dialects as well.
>>
>> Sure.
>
> Actually, would you be ok with smb_unicode_common ? The reason is that
> you end up with a module named unicode_common that sounds too generic.
A bit off topic, but a question for Steve.
Is there a need for separate modules under fs/smb/common/? Or could the
makefile do something like:
obj-$(CONFIG_SMBFS) += smb_common.o
smb_common-y := cifs.arc4.o cifs_md4.o smb_unicode.o
Shaggy
>
> Dave
>
>> Dave
>>
>>> Tom.
>>>
>>>> fs/smb/server/unicode.c | 1 -
>>>> fs/smb/server/unicode.h | 301 +----------------
>>>> 8 files changed, 298 insertions(+), 993 deletions(-)
>>>> delete mode 100644 fs/smb/client/cifs_uniupr.h
>>>> rename fs/smb/{server/uniupr.h => common/cifs_unicode_common.c} (50%)
>>>> create mode 100644 fs/smb/common/cifs_unicode_common.h
>>>>
>> --
>> -----Open up your eyes, open up your mind, open up your code -------
>> / Dr. David Alan Gilbert | Running GNU/Linux | Happy \
>> \ dave @ treblig.org | | In Hex /
>> \ _________________________|_____ http://www.treblig.org |_______/
On Wed, Jun 28, 2023 at 9:24 AM Dave Kleikamp <[email protected]> wrote:
>
> On 6/28/23 8:46AM, Dr. David Alan Gilbert wrote:
> > * Dr. David Alan Gilbert ([email protected]) wrote:
> >> * Tom Talpey ([email protected]) wrote:
> >>> On 6/27/2023 9:14 PM, [email protected] wrote:
> >>>> From: "Dr. David Alan Gilbert" <[email protected]>
> >>>>
> >>>> 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.
> >>>>
> >>>> I'd love to also boil out the same code from fs/jfs/ - but that's
> >>>> a thought for another time (and harder since there's no good test
> >>>> for it).
> >>>>
> >>>> 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
> >>>>
> >>>> Dr. David Alan Gilbert (3):
> >>>> fs/smb: Remove unicode 'lower' tables
> >>>> fs/smb: Swing unicode common code from server->common
> >>>> fs/smb/client: Use common code in client
> >>>>
> >>>> fs/smb/client/cifs_unicode.c | 1 -
> >>>> fs/smb/client/cifs_unicode.h | 313 +-----------------
> >>>> fs/smb/client/cifs_uniupr.h | 239 -------------
> >>>> fs/smb/common/Makefile | 1 +
> >>>> .../uniupr.h => common/cifs_unicode_common.c} | 156 +--------
> >>>> fs/smb/common/cifs_unicode_common.h | 279 ++++++++++++++++
> >>>
> >>> So far so good, but please drop the "cifs_" prefix from this new file's
> >>> name, since its contents apply to later smb dialects as well.
> >>
> >> Sure.
> >
> > Actually, would you be ok with smb_unicode_common ? The reason is that
> > you end up with a module named unicode_common that sounds too generic.
>
> A bit off topic, but a question for Steve.
>
> Is there a need for separate modules under fs/smb/common/? Or could the
> makefile do something like:
>
> obj-$(CONFIG_SMBFS) += smb_common.o
>
> smb_common-y := cifs.arc4.o cifs_md4.o smb_unicode.o
Since arc4 and md4 are used more rarely used than smb_unicode (and in
some environments
use of md4 could be forbidden), and also since arc4 and md4 are not
really smb/cifs but crypto,
seems more logical to keep them separate. There are other things
like quic support
(which is important for smb3.1.1) that will probably be much larger
(even with upcalls) that
could also be distinct modules in fs/smb/common in the future.
--
Thanks,
Steve