The following commit has been merged in the openafs-stable-1_8_x branch: commit 5bb7684f07b5f346b68230c2f38edad4c46dc648 Author: Benjamin Kaduk <ka...@mit.edu> Date: Thu Jan 4 22:00:15 2018 -0600
rx: remove trailing semicolons from FBSD mutex operations Since the first introduction of FreeBSD support, the macros (MUTEX_ENTER, etc.) for kernel mutex operations have included trailing semicolons, unique among all the platforms. This did not cause problems until the recent work on rx event handlers, which put a MUTEX_ENTER() in the body of an 'if' clause with no brackets, and attempted to follow it with an 'else' clause. This results in the following (rather obtuse) compiler error: /root/openafs/src/rx/rx.c:3666:5: error: expected expression else ^ Which is more visible in the preprocessed source, as if (condition) expression;; else other_expression; is clearly invalid C. To fix the FreeBSD kernel module build, remove the unneeded semicolons. Reviewed-on: https://gerrit.openafs.org/12853 Tested-by: BuildBot <build...@rampaginggeek.com> Reviewed-by: Benjamin Kaduk <ka...@mit.edu> (cherry picked from commit 0760feb7992e1e39f716c5f583fe7f6e85584262) Change-Id: I503a5967a167e9be92721af8dc82d191f3bf18ba Reviewed-on: https://gerrit.openafs.org/12899 Tested-by: BuildBot <build...@rampaginggeek.com> Reviewed-by: Mark Vitale <mvit...@sinenomine.net> Reviewed-by: Benjamin Kaduk <ka...@mit.edu> src/rx/FBSD/rx_kmutex.h | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) -- OpenAFS Master Repository _______________________________________________ OpenAFS-cvs mailing list OpenAFS-cvs@openafs.org https://lists.openafs.org/mailman/listinfo/openafs-cvs