OpenAFS Master Repository branch, master, updated. openafs-devel-1_9_1-200-gd9232fe

Gerrit Code Review
Thu, 18 Aug 2022 11:32:52 -0400

The following commit has been merged in the master branch:
commit d9232fedec06a6fcd953cceb73c54e48a638575a
Author: Cheyenne Wills <>
Date:   Fri Jun 3 13:22:19 2022 -0600

    afs: Cleanup AFS_S390X_ENV statement
    The commit 'Change AFS*_LINUXnn_ENV to AFS*_LINUX_ENV' (6329a523f6)
    mechanically replaced the multiple versions of the AFS*_LINUXnn_ENV
    definitions with non-versioned definitions.  A follow-on commit 'Cleanup
    AFS_*LINUX_ENV usage' (cbc18e4b3) refactored code to handle cleaning up
    redundant statements or removing dead code.
    The clean up in cbc18e4b3 missed a block of preprocessor statements in
    osi_probe.c which defined the macros _SS(x) and _SX(x).
    Prior to the commit 6329a523f6, these macros performed bit shifting or
    masking for the S390X LINUX20 environment.  For S390X LINUX24 or other
    platforms the macros just emitted their parameter.
    With commit 6329a523f6 the statement:
       #if defined(AFS_S390X_LINUX20_ENV) && !defined(AFS_S390X_LINUX24_ENV)
    was replaced with (which dropped support for S390X LINUX20):
       #if defined(AFS_S390X_LINUX_ENV) && !defined(AFS_S390X_LINUX_ENV)
    After cleaning up the conditional, the result leaves the definitions for
    _SS and _SX as:
       #define _SS(x) (x)
       #define _SX(x) (x)
    Which allows further cleanup by removing these macros and just using
    their arguments directly.
    Change-Id: I7b56c01ffd59e5f0220bf2a29e92a5cd41977b04
    Tested-by: BuildBot <>
    Reviewed-by: Michael Meffie <>
    Reviewed-by: Mark Vitale <>
    Reviewed-by: Andrew Deason <>
    Reviewed-by: Benjamin Kaduk <>

 src/afs/LINUX/osi_probe.c | 28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)

OpenAFS Master Repository