Land clang-format changes

Change-Id: I6f5d8140a06f3c1b2d196849299f8d483028d33b

3 files changed, 125 insertions, 148 deletions

diff --git a/glusterfsd/src/glusterfsd-mem-types.h b/glusterfsd/src/glusterfsd-mem-types.h
index 7135c0ada9e..8df01c475cb 100644
--- a/glusterfsd/src/glusterfsd-mem-types.h
+++ b/glusterfsd/src/glusterfsd-mem-types.h
@@ -15,13 +15,13 @@
 #define GF_MEM_TYPE_START (gf_common_mt_end + 1)
 
 enum gfd_mem_types_ {
-        gfd_mt_xlator_list_t = GF_MEM_TYPE_START,
-        gfd_mt_xlator_t,
-        gfd_mt_server_cmdline_t,
-        gfd_mt_xlator_cmdline_option_t,
-        gfd_mt_char,
-        gfd_mt_call_pool_t,
-        gfd_mt_end
+    gfd_mt_xlator_list_t = GF_MEM_TYPE_START,
+    gfd_mt_xlator_t,
+    gfd_mt_server_cmdline_t,
+    gfd_mt_xlator_cmdline_option_t,
+    gfd_mt_char,
+    gfd_mt_call_pool_t,
+    gfd_mt_end
 
 };
 #endif
diff --git a/glusterfsd/src/glusterfsd-messages.h b/glusterfsd/src/glusterfsd-messages.h
index e7df714064a..4adc9fd030a 100644
--- a/glusterfsd/src/glusterfsd-messages.h
+++ b/glusterfsd/src/glusterfsd-messages.h
@@ -23,46 +23,18 @@
  * glfs-message-id.h.
  */
 
-GLFS_MSGID(GLUSTERFSD,
-        glusterfsd_msg_1,
-        glusterfsd_msg_2,
-        glusterfsd_msg_3,
-        glusterfsd_msg_4,
-        glusterfsd_msg_5,
-        glusterfsd_msg_6,
-        glusterfsd_msg_7,
-        glusterfsd_msg_8,
-        glusterfsd_msg_9,
-        glusterfsd_msg_10,
-        glusterfsd_msg_11,
-        glusterfsd_msg_12,
-        glusterfsd_msg_13,
-        glusterfsd_msg_14,
-        glusterfsd_msg_15,
-        glusterfsd_msg_16,
-        glusterfsd_msg_17,
-        glusterfsd_msg_18,
-        glusterfsd_msg_19,
-        glusterfsd_msg_20,
-        glusterfsd_msg_21,
-        glusterfsd_msg_22,
-        glusterfsd_msg_23,
-        glusterfsd_msg_24,
-        glusterfsd_msg_25,
-        glusterfsd_msg_26,
-        glusterfsd_msg_27,
-        glusterfsd_msg_28,
-        glusterfsd_msg_29,
-        glusterfsd_msg_30,
-        glusterfsd_msg_31,
-        glusterfsd_msg_32,
-        glusterfsd_msg_33,
-        glusterfsd_msg_34,
-        glusterfsd_msg_35,
-        glusterfsd_msg_36,
-        glusterfsd_msg_37,
-        glusterfsd_msg_38,
-        glusterfsd_msg_39
-);
+GLFS_MSGID(GLUSTERFSD, glusterfsd_msg_1, glusterfsd_msg_2, glusterfsd_msg_3,
+           glusterfsd_msg_4, glusterfsd_msg_5, glusterfsd_msg_6,
+           glusterfsd_msg_7, glusterfsd_msg_8, glusterfsd_msg_9,
+           glusterfsd_msg_10, glusterfsd_msg_11, glusterfsd_msg_12,
+           glusterfsd_msg_13, glusterfsd_msg_14, glusterfsd_msg_15,
+           glusterfsd_msg_16, glusterfsd_msg_17, glusterfsd_msg_18,
+           glusterfsd_msg_19, glusterfsd_msg_20, glusterfsd_msg_21,
+           glusterfsd_msg_22, glusterfsd_msg_23, glusterfsd_msg_24,
+           glusterfsd_msg_25, glusterfsd_msg_26, glusterfsd_msg_27,
+           glusterfsd_msg_28, glusterfsd_msg_29, glusterfsd_msg_30,
+           glusterfsd_msg_31, glusterfsd_msg_32, glusterfsd_msg_33,
+           glusterfsd_msg_34, glusterfsd_msg_35, glusterfsd_msg_36,
+           glusterfsd_msg_37, glusterfsd_msg_38, glusterfsd_msg_39);
 
 #endif /* !_GLUSTERFSD_MESSAGES_H_ */
diff --git a/glusterfsd/src/glusterfsd.h b/glusterfsd/src/glusterfsd.h
index 72936371a55..28d46fc68b9 100644
--- a/glusterfsd/src/glusterfsd.h
+++ b/glusterfsd/src/glusterfsd.h
@@ -13,126 +13,131 @@
 #include "rpcsvc.h"
 #include "glusterd1-xdr.h"
 
-#define DEFAULT_GLUSTERD_VOLFILE              CONFDIR "/glusterd.vol"
-#define DEFAULT_CLIENT_VOLFILE                CONFDIR "/glusterfs.vol"
-#define DEFAULT_SERVER_VOLFILE                CONFDIR "/glusterfsd.vol"
+#define DEFAULT_GLUSTERD_VOLFILE CONFDIR "/glusterd.vol"
+#define DEFAULT_CLIENT_VOLFILE CONFDIR "/glusterfs.vol"
+#define DEFAULT_SERVER_VOLFILE CONFDIR "/glusterfsd.vol"
 
-#define DEFAULT_EVENT_POOL_SIZE            16384
+#define DEFAULT_EVENT_POOL_SIZE 16384
 
-#define ARGP_LOG_LEVEL_NONE_OPTION        "NONE"
-#define ARGP_LOG_LEVEL_TRACE_OPTION       "TRACE"
-#define ARGP_LOG_LEVEL_CRITICAL_OPTION    "CRITICAL"
-#define ARGP_LOG_LEVEL_ERROR_OPTION       "ERROR"
-#define ARGP_LOG_LEVEL_WARNING_OPTION     "WARNING"
-#define ARGP_LOG_LEVEL_INFO_OPTION        "INFO"
-#define ARGP_LOG_LEVEL_DEBUG_OPTION       "DEBUG"
+#define ARGP_LOG_LEVEL_NONE_OPTION "NONE"
+#define ARGP_LOG_LEVEL_TRACE_OPTION "TRACE"
+#define ARGP_LOG_LEVEL_CRITICAL_OPTION "CRITICAL"
+#define ARGP_LOG_LEVEL_ERROR_OPTION "ERROR"
+#define ARGP_LOG_LEVEL_WARNING_OPTION "WARNING"
+#define ARGP_LOG_LEVEL_INFO_OPTION "INFO"
+#define ARGP_LOG_LEVEL_DEBUG_OPTION "DEBUG"
 
-#define ENABLE_NO_DAEMON_MODE     1
-#define ENABLE_DEBUG_MODE         1
+#define ENABLE_NO_DAEMON_MODE 1
+#define ENABLE_DEBUG_MODE 1
 
-#define GF_MEMPOOL_COUNT_OF_DICT_T        4096
+#define GF_MEMPOOL_COUNT_OF_DICT_T 4096
 /* Considering 4 key/value pairs in a dictionary on an average */
-#define GF_MEMPOOL_COUNT_OF_DATA_T        (GF_MEMPOOL_COUNT_OF_DICT_T * 4)
-#define GF_MEMPOOL_COUNT_OF_DATA_PAIR_T   (GF_MEMPOOL_COUNT_OF_DICT_T * 4)
+#define GF_MEMPOOL_COUNT_OF_DATA_T (GF_MEMPOOL_COUNT_OF_DICT_T * 4)
+#define GF_MEMPOOL_COUNT_OF_DATA_PAIR_T (GF_MEMPOOL_COUNT_OF_DICT_T * 4)
 
-#define GF_MEMPOOL_COUNT_OF_LRU_BUF_T     256
+#define GF_MEMPOOL_COUNT_OF_LRU_BUF_T 256
 
 enum argp_option_keys {
-        ARGP_VOLFILE_SERVER_KEY           = 's',
-        ARGP_VOLUME_FILE_KEY              = 'f',
-        ARGP_LOG_LEVEL_KEY                = 'L',
-        ARGP_LOG_FILE_KEY                 = 'l',
-        ARGP_VOLFILE_SERVER_PORT_KEY      = 131,
-        ARGP_VOLFILE_SERVER_TRANSPORT_KEY = 132,
-        ARGP_PID_FILE_KEY                 = 'p',
-        ARGP_SOCK_FILE_KEY                = 'S',
-        ARGP_NO_DAEMON_KEY                = 'N',
-        ARGP_RUN_ID_KEY                   = 'r',
-        ARGP_PRINT_NETGROUPS              = 'n',
-        ARGP_PRINT_EXPORTS                = 'e',
-        ARGP_DEBUG_KEY                    = 133,
-        ARGP_NEGATIVE_TIMEOUT_KEY         = 134,
-        ARGP_ENTRY_TIMEOUT_KEY            = 135,
-        ARGP_ATTRIBUTE_TIMEOUT_KEY        = 136,
-        ARGP_VOLUME_NAME_KEY              = 137,
-        ARGP_XLATOR_OPTION_KEY            = 138,
-        ARGP_DIRECT_IO_MODE_KEY           = 139,
+    ARGP_VOLFILE_SERVER_KEY = 's',
+    ARGP_VOLUME_FILE_KEY = 'f',
+    ARGP_LOG_LEVEL_KEY = 'L',
+    ARGP_LOG_FILE_KEY = 'l',
+    ARGP_VOLFILE_SERVER_PORT_KEY = 131,
+    ARGP_VOLFILE_SERVER_TRANSPORT_KEY = 132,
+    ARGP_PID_FILE_KEY = 'p',
+    ARGP_SOCK_FILE_KEY = 'S',
+    ARGP_NO_DAEMON_KEY = 'N',
+    ARGP_RUN_ID_KEY = 'r',
+    ARGP_PRINT_NETGROUPS = 'n',
+    ARGP_PRINT_EXPORTS = 'e',
+    ARGP_DEBUG_KEY = 133,
+    ARGP_NEGATIVE_TIMEOUT_KEY = 134,
+    ARGP_ENTRY_TIMEOUT_KEY = 135,
+    ARGP_ATTRIBUTE_TIMEOUT_KEY = 136,
+    ARGP_VOLUME_NAME_KEY = 137,
+    ARGP_XLATOR_OPTION_KEY = 138,
+    ARGP_DIRECT_IO_MODE_KEY = 139,
 #ifdef GF_DARWIN_HOST_OS
-        ARGP_NON_LOCAL_KEY                = 140,
+    ARGP_NON_LOCAL_KEY = 140,
 #endif /* DARWIN */
-        ARGP_VOLFILE_ID_KEY               = 143,
-        ARGP_VOLFILE_CHECK_KEY            = 144,
-        ARGP_VOLFILE_MAX_FETCH_ATTEMPTS   = 145,
-        ARGP_LOG_SERVER_KEY               = 146,
-        ARGP_LOG_SERVER_PORT_KEY          = 147,
-        ARGP_READ_ONLY_KEY                = 148,
-        ARGP_MAC_COMPAT_KEY               = 149,
-        ARGP_DUMP_FUSE_KEY                = 150,
-        ARGP_BRICK_NAME_KEY               = 151,
-        ARGP_BRICK_PORT_KEY               = 152,
-        ARGP_CLIENT_PID_KEY               = 153,
-        ARGP_ACL_KEY                      = 154,
-        ARGP_WORM_KEY                     = 155,
-        ARGP_USER_MAP_ROOT_KEY            = 156,
-        ARGP_MEM_ACCOUNTING_KEY           = 157,
-        ARGP_SELINUX_KEY                  = 158,
-	ARGP_FOPEN_KEEP_CACHE_KEY	  = 159,
-	ARGP_GID_TIMEOUT_KEY		  = 160,
-	ARGP_FUSE_BACKGROUND_QLEN_KEY     = 161,
-	ARGP_FUSE_CONGESTION_THRESHOLD_KEY = 162,
-        ARGP_INODE32_KEY                  = 163,
-	ARGP_FUSE_MOUNTOPTS_KEY		  = 164,
-        ARGP_FUSE_USE_READDIRP_KEY        = 165,
-	ARGP_AUX_GFID_MOUNT_KEY		  = 166,
-        ARGP_FUSE_NO_ROOT_SQUASH_KEY      = 167,
-        ARGP_LOGGER                       = 168,
-        ARGP_LOG_FORMAT                   = 169,
-        ARGP_LOG_BUF_SIZE                 = 170,
-        ARGP_LOG_FLUSH_TIMEOUT            = 171,
-        ARGP_SECURE_MGMT_KEY              = 172,
-        ARGP_GLOBAL_TIMER_WHEEL           = 173,
-        ARGP_RESOLVE_GIDS_KEY             = 174,
-        ARGP_CAPABILITY_KEY               = 175,
+    ARGP_VOLFILE_ID_KEY = 143,
+    ARGP_VOLFILE_CHECK_KEY = 144,
+    ARGP_VOLFILE_MAX_FETCH_ATTEMPTS = 145,
+    ARGP_LOG_SERVER_KEY = 146,
+    ARGP_LOG_SERVER_PORT_KEY = 147,
+    ARGP_READ_ONLY_KEY = 148,
+    ARGP_MAC_COMPAT_KEY = 149,
+    ARGP_DUMP_FUSE_KEY = 150,
+    ARGP_BRICK_NAME_KEY = 151,
+    ARGP_BRICK_PORT_KEY = 152,
+    ARGP_CLIENT_PID_KEY = 153,
+    ARGP_ACL_KEY = 154,
+    ARGP_WORM_KEY = 155,
+    ARGP_USER_MAP_ROOT_KEY = 156,
+    ARGP_MEM_ACCOUNTING_KEY = 157,
+    ARGP_SELINUX_KEY = 158,
+    ARGP_FOPEN_KEEP_CACHE_KEY = 159,
+    ARGP_GID_TIMEOUT_KEY = 160,
+    ARGP_FUSE_BACKGROUND_QLEN_KEY = 161,
+    ARGP_FUSE_CONGESTION_THRESHOLD_KEY = 162,
+    ARGP_INODE32_KEY = 163,
+    ARGP_FUSE_MOUNTOPTS_KEY = 164,
+    ARGP_FUSE_USE_READDIRP_KEY = 165,
+    ARGP_AUX_GFID_MOUNT_KEY = 166,
+    ARGP_FUSE_NO_ROOT_SQUASH_KEY = 167,
+    ARGP_LOGGER = 168,
+    ARGP_LOG_FORMAT = 169,
+    ARGP_LOG_BUF_SIZE = 170,
+    ARGP_LOG_FLUSH_TIMEOUT = 171,
+    ARGP_SECURE_MGMT_KEY = 172,
+    ARGP_GLOBAL_TIMER_WHEEL = 173,
+    ARGP_RESOLVE_GIDS_KEY = 174,
+    ARGP_CAPABILITY_KEY = 175,
 #ifdef GF_LINUX_HOST_OS
-        ARGP_OOM_SCORE_ADJ_KEY            = 176,
+    ARGP_OOM_SCORE_ADJ_KEY = 176,
 #endif
-        ARGP_LOCALTIME_LOGGING_KEY        = 177,
-        ARGP_SUBDIR_MOUNT_KEY             = 178,
-        ARGP_PROCESS_NAME_KEY             = 179,
-        ARGP_FUSE_EVENT_HISTORY_KEY       = 180,
-        ARGP_THIN_CLIENT_KEY              = 181,
-        ARGP_READER_THREAD_COUNT_KEY      = 182,
-        ARGP_PRINT_XLATORDIR_KEY          = 183,
-        ARGP_PRINT_STATEDUMPDIR_KEY       = 184,
-        ARGP_PRINT_LOGDIR_KEY             = 185,
-        ARGP_KERNEL_WRITEBACK_CACHE_KEY   = 186,
-        ARGP_ATTR_TIMES_GRANULARITY_KEY   = 187,
-        ARGP_PRINT_LIBEXECDIR_KEY         = 188,
+    ARGP_LOCALTIME_LOGGING_KEY = 177,
+    ARGP_SUBDIR_MOUNT_KEY = 178,
+    ARGP_PROCESS_NAME_KEY = 179,
+    ARGP_FUSE_EVENT_HISTORY_KEY = 180,
+    ARGP_THIN_CLIENT_KEY = 181,
+    ARGP_READER_THREAD_COUNT_KEY = 182,
+    ARGP_PRINT_XLATORDIR_KEY = 183,
+    ARGP_PRINT_STATEDUMPDIR_KEY = 184,
+    ARGP_PRINT_LOGDIR_KEY = 185,
+    ARGP_KERNEL_WRITEBACK_CACHE_KEY = 186,
+    ARGP_ATTR_TIMES_GRANULARITY_KEY = 187,
+    ARGP_PRINT_LIBEXECDIR_KEY = 188,
 };
 
 struct _gfd_vol_top_priv {
-        rpcsvc_request_t        *req;
-        gd1_mgmt_brick_op_req   xlator_req;
-        uint32_t                blk_count;
-        uint32_t                blk_size;
-        double                  throughput;
-        double                  time;
-        int32_t                 ret;
+    rpcsvc_request_t *req;
+    gd1_mgmt_brick_op_req xlator_req;
+    uint32_t blk_count;
+    uint32_t blk_size;
+    double throughput;
+    double time;
+    int32_t ret;
 };
 typedef struct _gfd_vol_top_priv gfd_vol_top_priv_t;
 
-int glusterfs_mgmt_pmap_signin (glusterfs_ctx_t *ctx);
-int glusterfs_volfile_fetch (glusterfs_ctx_t *ctx);
-void cleanup_and_exit (int signum);
+int
+glusterfs_mgmt_pmap_signin(glusterfs_ctx_t *ctx);
+int
+glusterfs_volfile_fetch(glusterfs_ctx_t *ctx);
+void
+cleanup_and_exit(int signum);
 
-int glusterfs_volume_top_write_perf (uint32_t blk_size, uint32_t blk_count,
-                                     char *brick_path, double *throughput,
-                                     double *time);
-int glusterfs_volume_top_read_perf (uint32_t blk_size, uint32_t blk_count,
-                                    char *brick_path, double *throughput,
-                                    double *time);
+int
+glusterfs_volume_top_write_perf(uint32_t blk_size, uint32_t blk_count,
+                                char *brick_path, double *throughput,
+                                double *time);
+int
+glusterfs_volume_top_read_perf(uint32_t blk_size, uint32_t blk_count,
+                               char *brick_path, double *throughput,
+                               double *time);
 void
-xlator_mem_cleanup (xlator_t *this);
+xlator_mem_cleanup(xlator_t *this);
 
 extern glusterfs_ctx_t *glusterfsd_ctx;
 #endif /* __GLUSTERFSD_H__ */