OpenAFS Master Repository branch, master, updated. openafs-devel-1_9_1-149-g51c0387

[Gerrit Code Review]

The following commit has been merged in the master branch:
commit 51c0387aaa5ec507c6e29063ef56d98e2931402d
Author: Marcio Barbosa <mbarbosa@sinenomine.net>
Date:   Wed Mar 23 16:04:46 2022 -0300

    UKERNEL: Remove flock -> usr_flock redirection
    
    In order to replace 'struck flock' with 'struct usr_flock' and 'flock()'
    with 'usr_flock()', the current version of src/afs/UKERNEL/sysincludes.h
    defines flock to usr_flock. This can cause problems when trying to use
    libroken in UKERNEL code, because roken.h redefines flock.
    
    To avoid conflicts with libroken (included in a future commit), add a
    new UKERNEL specific AFS_FLOCK -> usr_flock redirection. Doing so, the
    flock -> usr_flock redirection can be removed. While here, also remove
    'usr_flock()' as it shouldn't be called and is not defined in any header
    file.
    
    Change-Id: Ia71811513ab6655f60d8b63fc18b26be663ab4dc
    Reviewed-on: https://gerrit.openafs.org/14913
    Reviewed-by: Andrew Deason <adeason@sinenomine.net>
    Reviewed-by: Cheyenne Wills <cwills@sinenomine.net>
    Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
    Tested-by: BuildBot <buildbot@rampaginggeek.com>

 src/afs/UKERNEL/afs_usrops.c  | 11 -----------
 src/afs/UKERNEL/sysincludes.h |  4 +---
 src/afs/afs.h                 | 16 ++++++++--------
 3 files changed, 9 insertions(+), 22 deletions(-)

-- 
OpenAFS Master Repository