From: John Coyle <dx9err@gmail.com>
Date: Wed, 14 Oct 2015 14:54:17 +0000 (-0400)
Subject: os/filestore: The usage of __SWORD_TYPE hinders portability because it's not standard... 
X-Git-Tag: v10.0.2~170^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c4182651cfb31c5ca90a004a2aeec687def6dea7;p=ceph.git

os/filestore: The usage of __SWORD_TYPE hinders portability because it's not standardized. Removed __SWORD_TYPE dependency.

Signed-off-by: John Coyle <dx9err@gmail.com>
---

diff --git a/src/os/FileStore.h b/src/os/FileStore.h
index 2a04da2ac1aa..31c7da97a2fb 100644
--- a/src/os/FileStore.h
+++ b/src/os/FileStore.h
@@ -52,14 +52,14 @@ using namespace std;
 
 #if defined(__linux__)
 # ifndef BTRFS_SUPER_MAGIC
-static const __SWORD_TYPE BTRFS_SUPER_MAGIC(0x9123683E);
+#define BTRFS_SUPER_MAGIC 0x9123683E
 # endif
 # ifndef XFS_SUPER_MAGIC
-static const __SWORD_TYPE XFS_SUPER_MAGIC(0x58465342);
+#define XFS_SUPER_MAGIC 0x58465342
+# endif
+# ifndef ZFS_SUPER_MAGIC
+#define ZFS_SUPER_MAGIC 0x2fc12fc1
 # endif
-#ifndef ZFS_SUPER_MAGIC
-static const __SWORD_TYPE ZFS_SUPER_MAGIC(0x2fc12fc1);
-#endif
 #endif