From 0314cffbee9c0b3ae6c24aea1bbf56afc2e49a40 Mon Sep 17 00:00:00 2001
From: Willem Jan Withagen <wjw@digiware.nl>
Date: Mon, 29 Oct 2018 22:47:35 +0100
Subject: [PATCH] common: Fix Alpine compatability for TEMP_FAILURE_RETRY and
 ACCESSPERMS

Compiler output:
/ceph/src/common/blkdev.cc: In function 'int64_t get_vdo_stat(int, const char*)':
/ceph/src/common/blkdev.cc:337:3: error: 'TEMP_FAILURE_RETRY' was not declared in this scope
   TEMP_FAILURE_RETRY(::close(fd));

And

/ceph/src/common/common_init.cc: In function 'void common_init_finish(CephContext*)':
/ceph/src/common/common_init.cc:124:21: error: 'ACCESSPERMS' was not declared in this scope
       if (!(ret & (~ACCESSPERMS))) {
                     ^~~~~~~~~~~-

Reported-by: Beierl, Mark <Mark.Beierl@dell.com>
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
---
 src/client/posix_acl.cc   | 5 +----
 src/common/blkdev.cc      | 2 ++
 src/common/common_init.cc | 1 +
 src/include/compat.h      | 5 +++++
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/client/posix_acl.cc b/src/client/posix_acl.cc
index e6331ed294c2c..181c529eac51c 100644
--- a/src/client/posix_acl.cc
+++ b/src/client/posix_acl.cc
@@ -1,12 +1,9 @@
+#include "include/compat.h"
 #include "include/types.h"
 #include <sys/stat.h>
 #include "posix_acl.h"
 #include "UserPerm.h"
 
-#ifndef ACCESSPERMS
-#define ACCESSPERMS (S_IRWXU|S_IRWXG|S_IRWXO)
-#endif
-
 int posix_acl_check(const void *xattr, size_t size)
 {
   const acl_ea_header *header;
diff --git a/src/common/blkdev.cc b/src/common/blkdev.cc
index 8ddffda55f0fc..b2b908cbe1b2a 100644
--- a/src/common/blkdev.cc
+++ b/src/common/blkdev.cc
@@ -12,6 +12,8 @@
  *
  */
 
+#include "include/compat.h"
+
 #ifdef __FreeBSD__
 #include <sys/param.h>
 #include <geom/geom_disk.h>
diff --git a/src/common/common_init.cc b/src/common/common_init.cc
index 5625fd584896d..a7cc4d724529e 100644
--- a/src/common/common_init.cc
+++ b/src/common/common_init.cc
@@ -12,6 +12,7 @@
  *
  */
 
+#include "include/compat.h"
 #include "common/common_init.h"
 #include "common/admin_socket.h"
 #include "common/ceph_argparse.h"
diff --git a/src/include/compat.h b/src/include/compat.h
index c9032d2578748..a18188b6ecf27 100644
--- a/src/include/compat.h
+++ b/src/include/compat.h
@@ -19,6 +19,11 @@
 #define PROCPREFIX
 #endif
 
+#include <sys/stat.h>
+#ifndef ACCESSPERMS
+#define ACCESSPERMS (S_IRWXU|S_IRWXG|S_IRWXO)
+#endif
+
 #if defined(__FreeBSD__)
 
 // FreeBSD supports Linux procfs with its compatibility module
-- 
2.39.5