OpenAFS Master Repository branch, openafs-stable-1_6_x, updated. openafs-stable-1_6_22_2-44-g6d6ce54

Gerrit Code Review
Mon, 6 Aug 2018 11:44:32 -0400

The following commit has been merged in the openafs-stable-1_6_x branch:
commit 6d6ce542e08c2064beaf9cf08c722e19beae5701
Author: Andrew Deason <>
Date:   Mon Mar 9 18:01:29 2015 -0500

    LINUX: Don't compile syscall code with keyrings
    osi_syscall_init() is not currently called if we have kernel keyrings
    support, since we don't need to set up or alter any syscalls if we
    have kernel keyrings (we track PAGs by keyrings, and we use ioctls
    instead of the AFS syscall now).
    Since we don't call it, this commit makes us also not compile the
    relevant syscall-related code. This allows new platforms to be added
    without needing to deal with any platform-specific code for handling
    32-bit compat processes and such, since usually we don't need to deal
    with intercepting syscalls.
    To do this, we just define osi_syscall_init and osi_syscall_cleanup as
    noops if we have keyrings support. This allows us to reduce the #ifdef
    clutter in the actual callers.
    Note that the 'afspag' module does currently call osi_syscall_init
    unconditionally, but this seems like an oversight. With this change,
    the afspag module will no longer alter syscalls when we have linux
    keyrings support.
    Reviewed-by: Chas Williams <>
    Reviewed-by: Perry Ruiter <>
    Reviewed-by: Michael Meffie <>
    Tested-by: BuildBot <>
    Reviewed-by: Benjamin Kaduk <>
    (cherry picked from commit 32901c58b29ba4ac666f1dba9915cae2c1f03b52)
    Change-Id: I95fb6fffc78dacef00033178acd78ad04521ae13
    Tested-by: BuildBot <>
    Reviewed-by: Benjamin Kaduk <>
    Reviewed-by: Stephan Wiesand <>

 src/afs/LINUX/osi_groups.c  |   28 ++++++++++++++--------------
 src/afs/LINUX/osi_module.c  |    8 --------
 src/afs/LINUX/osi_syscall.c |   18 ++++++++++++++++++
 3 files changed, 32 insertions(+), 22 deletions(-)

OpenAFS Master Repository