The following commit has been merged in the openafs-stable-1_8_x branch:
commit fc5be911a0ef216b9af79a0ec6bc32512085d398
Author: Marcio Barbosa <[email protected]>
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.
Reviewed-on: https://gerrit.openafs.org/14913
Reviewed-by: Andrew Deason <[email protected]>
Reviewed-by: Cheyenne Wills <[email protected]>
Reviewed-by: Benjamin Kaduk <[email protected]>
Tested-by: BuildBot <[email protected]>
(cherry picked from commit 51c0387aaa5ec507c6e29063ef56d98e2931402d)
Change-Id: I3c2d9de056bae3f2fed68f1ec183540b63584a43
Reviewed-on: https://gerrit.openafs.org/15238
Reviewed-by: Michael Meffie <[email protected]>
Tested-by: BuildBot <[email protected]>
Reviewed-by: Harish Sharma <[email protected]>
Reviewed-by: Stephan Wiesand <[email protected]>
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
_______________________________________________
OpenAFS-cvs mailing list
[email protected]
https://lists.openafs.org/mailman/listinfo/openafs-cvs
