From 2c0d11bb406e50fb515abf0c5a4006e1b362ac8e Mon Sep 17 00:00:00 2001 From: Emmanuel Dreyfus Date: Tue, 30 Jun 2020 16:42:36 +0200 Subject: [PATCH 571/584] NetBSD build fixes - Make sure -largp is used at link time - PTHREAD_MUTEX_ADAPTIVE_NP is not available, use PTHREAD_MUTEX_DEFAULT instead - Avoid non POSIX [[ ]] in scripts - Do not check of lock.spinlock is NULL since it is not a pointer (it is not a pointer on Linux either) Backport of: > Upstream-patch: https://review.gluster.org/#/c/glusterfs/+/24648/ > Change-Id: I5e04a7c552d24f8a473c2b837828d1bddfa7e128 > Fixes: #1347 > Type: Bug > Signed-off-by: Emmanuel Dreyfus BUG: 1925425 Change-Id: I5e04a7c552d24f8a473c2b837828d1bddfa7e128 Signed-off-by: Emmanuel Dreyfus Reviewed-on: https://code.engineering.redhat.com/gerrit/c/rhs-glusterfs/+/245040 Tested-by: RHGS Build Bot Reviewed-by: Sunil Kumar Heggodu Gopala Acharya --- configure.ac | 3 +++ rpc/rpc-lib/src/rpcsvc.c | 4 ++++ tools/gfind_missing_files/gfind_missing_files.sh | 2 +- xlators/performance/write-behind/src/write-behind.c | 4 ++-- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 327733e..6138a59 100644 --- a/configure.ac +++ b/configure.ac @@ -998,6 +998,9 @@ case $host_os in CFLAGS="${CFLAGS} -isystem /usr/local/include" ARGP_LDADD=-largp ;; + *netbsd*) + ARGP_LDADD=-largp + ;; esac dnl argp-standalone does not provide a pkg-config file AC_CHECK_HEADER([argp.h], AC_DEFINE(HAVE_ARGP, 1, [have argp])) diff --git a/rpc/rpc-lib/src/rpcsvc.c b/rpc/rpc-lib/src/rpcsvc.c index 3f184bf..b031d93 100644 --- a/rpc/rpc-lib/src/rpcsvc.c +++ b/rpc/rpc-lib/src/rpcsvc.c @@ -46,6 +46,10 @@ #include "xdr-rpcclnt.h" #include +#ifndef PTHREAD_MUTEX_ADAPTIVE_NP +#define PTHREAD_MUTEX_ADAPTIVE_NP PTHREAD_MUTEX_DEFAULT +#endif + struct rpcsvc_program gluster_dump_prog; #define rpcsvc_alloc_request(svc, request) \ diff --git a/tools/gfind_missing_files/gfind_missing_files.sh b/tools/gfind_missing_files/gfind_missing_files.sh index f42fe7b..e7aaa0b 100644 --- a/tools/gfind_missing_files/gfind_missing_files.sh +++ b/tools/gfind_missing_files/gfind_missing_files.sh @@ -61,7 +61,7 @@ mount_slave() parse_cli() { - if [[ $# -ne 4 ]]; then + if [ "$#" -ne 4 ]; then echo "Usage: gfind_missing_files " exit 1 else diff --git a/xlators/performance/write-behind/src/write-behind.c b/xlators/performance/write-behind/src/write-behind.c index 31ab723..76d257f 100644 --- a/xlators/performance/write-behind/src/write-behind.c +++ b/xlators/performance/write-behind/src/write-behind.c @@ -2490,7 +2490,7 @@ wb_mark_readdirp_start(xlator_t *this, inode_t *directory) wb_directory_inode = wb_inode_create(this, directory); - if (!wb_directory_inode || !wb_directory_inode->lock.spinlock) + if (!wb_directory_inode) return; LOCK(&wb_directory_inode->lock); @@ -2510,7 +2510,7 @@ wb_mark_readdirp_end(xlator_t *this, inode_t *directory) wb_directory_inode = wb_inode_ctx_get(this, directory); - if (!wb_directory_inode || !wb_directory_inode->lock.spinlock) + if (!wb_directory_inode) return; LOCK(&wb_directory_inode->lock); -- 1.8.3.1