OpenAFS Master Repository branch, master, updated. openafs-devel-1_9_1-88-g22876c8

Gerrit Code Review
Thu, 16 Sep 2021 12:11:28 -0400

The following commit has been merged in the master branch:
commit 22876c8b88f8e5e92f08b230e5e1959499f0c406
Author: Cheyenne Wills <>
Date:   Tue Sep 14 06:36:49 2021 -0600

    Linux 5.15: Convert osi_Msg macro to a function
    With Linux 5.15-prerc1 printk is defined as a macro instead of a
    function ("printk: Userspace format indexing support" 33701557)
    This change is causing a build failure:
     .../src/rx/rx_kernel.h:62:18: error: ‘printk’ undeclared (first use in
       this function); did you mean ‘_printk’?
       62 | # define osi_Msg printk)(
          |                  ^~~~~~
    The definition and use of the osi_Msg and osi_VMsg macros are
    unconventional and the C preprocessor is not handling the macro
    expansion when printk is itself a macro.
       #define osi_Msg printk)(
       (osi_Msg "%s", x);
    Change osi_Msg to a function, and simply replace osi_VMsg with vprintf
    since osi_VMsg is only used at one location within user space code.
    osi_Msg is implemented in 2 locations, in rx_kcommon for kernel space
    and in rx_user for userspace.
    Note: The unconventional definitions of osi_Msg/osi_VMsg was historical
    and due to older compilers not supporting variadic macros.  All of
    the currently support platforms should now support variadic functions.
    Change-Id: I9f015e4929f2c5120e200d2b0378871e8d1375b3
    Tested-by: BuildBot <>
    Reviewed-by: Michael Meffie <>
    Reviewed-by: Andrew Deason <>
    Reviewed-by: Benjamin Kaduk <>

 src/rx/rx.c          |  8 ++++----
 src/rx/rx_internal.h |  3 +++
 src/rx/rx_kcommon.c  | 13 +++++++++++++
 src/rx/rx_kernel.h   |  7 -------
 src/rx/rx_lwp.c      |  8 ++++----
 src/rx/rx_user.c     | 21 +++++++++++++++------
 src/rx/rx_user.h     |  3 ---
 7 files changed, 39 insertions(+), 24 deletions(-)

OpenAFS Master Repository