Multiple xlator .h files: remove unused private gf_* memory types.

It seems there were quite a few unused enums (that in turn
cause unndeeded memory allocation) in some xlators.
I've removed them, hopefully not causing any damage.

Compile-tested only!

updates: bz#1193929
Signed-off-by: Yaniv Kaul <ykaul@redhat.com>

Change-Id: I8252bd763dc1506e2d922496d896cd2fc0886ea7

16 files changed, 47 insertions, 111 deletions

diff --git a/rpc/rpc-transport/socket/src/socket-mem-types.h b/rpc/rpc-transport/socket/src/socket-mem-types.h
index 81635b72320..edf3ed0c6f1 100644
--- a/rpc/rpc-transport/socket/src/socket-mem-types.h
+++ b/rpc/rpc-transport/socket/src/socket-mem-types.h
@@ -16,7 +16,6 @@
 typedef enum gf_sock_mem_types_ {
     gf_sock_connect_error_state_t = gf_common_mt_end + 1,
     gf_sock_mt_lock_array,
-    gf_sock_mt_tid_wrap,
     gf_sock_mt_end
 } gf_sock_mem_types_t;
 
diff --git a/xlators/cluster/afr/src/afr-mem-types.h b/xlators/cluster/afr/src/afr-mem-types.h
index d62f7876bcd..531184b4bd7 100644
--- a/xlators/cluster/afr/src/afr-mem-types.h
+++ b/xlators/cluster/afr/src/afr-mem-types.h
@@ -14,32 +14,16 @@
 #include "mem-types.h"
 
 enum gf_afr_mem_types_ {
-    gf_afr_mt_iovec = gf_common_mt_end + 1,
-    gf_afr_mt_afr_fd_ctx_t,
+    gf_afr_mt_afr_fd_ctx_t = gf_common_mt_end + 1,
     gf_afr_mt_afr_private_t,
     gf_afr_mt_int32_t,
     gf_afr_mt_char,
     gf_afr_mt_xattr_key,
     gf_afr_mt_dict_t,
     gf_afr_mt_xlator_t,
-    gf_afr_mt_iatt,
-    gf_afr_mt_int,
     gf_afr_mt_afr_node_character,
-    gf_afr_mt_sh_diff_loop_state,
-    gf_afr_mt_uint8_t,
-    gf_afr_mt_loc_t,
-    gf_afr_mt_entry_name,
-    gf_afr_mt_pump_priv,
-    gf_afr_mt_locked_fd,
     gf_afr_mt_inode_ctx_t,
-    gf_afr_fd_paused_call_t,
-    gf_afr_mt_crawl_data_t,
-    gf_afr_mt_brick_pos_t,
-    gf_afr_mt_shd_bool_t,
-    gf_afr_mt_shd_timer_t,
     gf_afr_mt_shd_event_t,
-    gf_afr_mt_time_t,
-    gf_afr_mt_pos_data_t,
     gf_afr_mt_reply_t,
     gf_afr_mt_subvol_healer_t,
     gf_afr_mt_spbc_timeout_t,
diff --git a/xlators/cluster/dht/src/dht-mem-types.h b/xlators/cluster/dht/src/dht-mem-types.h
index 5b728f86c95..c4430741ff7 100644
--- a/xlators/cluster/dht/src/dht-mem-types.h
+++ b/xlators/cluster/dht/src/dht-mem-types.h
@@ -20,15 +20,12 @@ enum gf_dht_mem_types_ {
     gf_dht_mt_int32_t,
     gf_dht_mt_xlator_t,
     gf_dht_mt_dht_layout_t,
-    gf_switch_mt_dht_conf_t,
-    gf_switch_mt_dht_du_t,
     gf_switch_mt_switch_sched_array,
     gf_switch_mt_switch_struct,
     gf_dht_mt_subvol_time,
     gf_dht_mt_loc_t,
     gf_defrag_info_mt,
     gf_dht_mt_inode_ctx_t,
-    gf_dht_mt_ctx_stat_time_t,
     gf_dht_mt_dirent_t,
     gf_dht_mt_container_t,
     gf_dht_mt_octx_t,
diff --git a/xlators/cluster/ec/src/ec-mem-types.h b/xlators/cluster/ec/src/ec-mem-types.h
index fc33d09ea33..7af8fe2ef49 100644
--- a/xlators/cluster/ec/src/ec-mem-types.h
+++ b/xlators/cluster/ec/src/ec-mem-types.h
@@ -18,7 +18,6 @@ enum gf_ec_mem_types_ {
     ec_mt_xlator_t,
     ec_mt_ec_inode_t,
     ec_mt_ec_fd_t,
-    ec_mt_ec_heal_t,
     ec_mt_subvol_healer_t,
     ec_mt_ec_gf_t,
     ec_mt_ec_code_t,
diff --git a/xlators/features/index/src/index-mem-types.h b/xlators/features/index/src/index-mem-types.h
index f5d456e84be..a663d76023d 100644
--- a/xlators/features/index/src/index-mem-types.h
+++ b/xlators/features/index/src/index-mem-types.h
@@ -15,9 +15,9 @@
 
 enum gf_index_mem_types_ {
     gf_index_mt_priv_t = gf_common_mt_end + 1,
-    gf_index_inode_ctx_t = gf_common_mt_end + 2,
-    gf_index_fd_ctx_t = gf_common_mt_end + 3,
-    gf_index_mt_local_t = gf_common_mt_end + 4,
+    gf_index_inode_ctx_t,
+    gf_index_fd_ctx_t,
+    gf_index_mt_local_t,
     gf_index_mt_end
 };
 #endif
diff --git a/xlators/features/leases/src/leases-mem-types.h b/xlators/features/leases/src/leases-mem-types.h
index 59d3cbaf0b3..3a646cbc316 100644
--- a/xlators/features/leases/src/leases-mem-types.h
+++ b/xlators/features/leases/src/leases-mem-types.h
@@ -14,8 +14,7 @@
 #include "mem-types.h"
 
 enum gf_leases_mem_types_ {
-    gf_leases_mt_conf_t = gf_common_mt_end + 1,
-    gf_leases_mt_private_t,
+    gf_leases_mt_private_t = gf_common_mt_end + 1,
     gf_leases_mt_lease_client_t,
     gf_leases_mt_lease_inode_t,
     gf_leases_mt_fd_ctx_t,
diff --git a/xlators/features/locks/src/locks-mem-types.h b/xlators/features/locks/src/locks-mem-types.h
index 240c1957a42..bec7db2d58e 100644
--- a/xlators/features/locks/src/locks-mem-types.h
+++ b/xlators/features/locks/src/locks-mem-types.h
@@ -19,7 +19,6 @@ enum gf_locks_mem_types_ {
     gf_locks_mt_posix_lock_t,
     gf_locks_mt_pl_entry_lock_t,
     gf_locks_mt_pl_inode_lock_t,
-    gf_locks_mt_truncate_ops,
     gf_locks_mt_pl_rw_req_t,
     gf_locks_mt_posix_locks_private_t,
     gf_locks_mt_pl_fdctx_t,
diff --git a/xlators/features/marker/src/marker-mem-types.h b/xlators/features/marker/src/marker-mem-types.h
index 7d590d7ec84..0b50668a023 100644
--- a/xlators/features/marker/src/marker-mem-types.h
+++ b/xlators/features/marker/src/marker-mem-types.h
@@ -13,6 +13,7 @@
 #include "mem-types.h"
 
 enum gf_marker_mem_types_ {
+    /* Those are used by ALLOCATE_OR_GOTO macro */
     gf_marker_mt_marker_conf_t = gf_common_mt_end + 1,
     gf_marker_mt_loc_t,
     gf_marker_mt_volume_mark,
diff --git a/xlators/features/quota/src/quota-mem-types.h b/xlators/features/quota/src/quota-mem-types.h
index e04d2e846cd..24b198eae35 100644
--- a/xlators/features/quota/src/quota-mem-types.h
+++ b/xlators/features/quota/src/quota-mem-types.h
@@ -13,6 +13,7 @@
 #include "mem-types.h"
 
 enum gf_quota_mem_types_ {
+    /* Those are used by QUOTA_ALLOC_OR_GOTO macro */
     gf_quota_mt_quota_priv_t = gf_common_mt_end + 1,
     gf_quota_mt_quota_inode_ctx_t,
     gf_quota_mt_loc_t,
diff --git a/xlators/mgmt/glusterd/src/glusterd-mem-types.h b/xlators/mgmt/glusterd/src/glusterd-mem-types.h
index 210d0f8658c..c0c4e5e17f6 100644
--- a/xlators/mgmt/glusterd/src/glusterd-mem-types.h
+++ b/xlators/mgmt/glusterd/src/glusterd-mem-types.h
@@ -14,64 +14,43 @@
 #include "mem-types.h"
 
 typedef enum gf_gld_mem_types_ {
-    gf_gld_mt_dir_entry_t = gf_common_mt_end + 1,
-    gf_gld_mt_volfile_ctx = gf_common_mt_end + 2,
-    gf_gld_mt_glusterd_state_t = gf_common_mt_end + 3,
-    gf_gld_mt_glusterd_conf_t = gf_common_mt_end + 4,
-    gf_gld_mt_locker = gf_common_mt_end + 5,
-    gf_gld_mt_string = gf_common_mt_end + 6,
-    gf_gld_mt_lock_table = gf_common_mt_end + 7,
-    gf_gld_mt_char = gf_common_mt_end + 8,
-    gf_gld_mt_glusterd_connection_t = gf_common_mt_end + 9,
-    gf_gld_mt_resolve_comp = gf_common_mt_end + 10,
-    gf_gld_mt_peerinfo_t = gf_common_mt_end + 11,
-    gf_gld_mt_friend_sm_event_t = gf_common_mt_end + 12,
-    gf_gld_mt_friend_req_ctx_t = gf_common_mt_end + 13,
-    gf_gld_mt_friend_update_ctx_t = gf_common_mt_end + 14,
-    gf_gld_mt_op_sm_event_t = gf_common_mt_end + 15,
-    gf_gld_mt_op_lock_ctx_t = gf_common_mt_end + 16,
-    gf_gld_mt_op_stage_ctx_t = gf_common_mt_end + 17,
-    gf_gld_mt_op_commit_ctx_t = gf_common_mt_end + 18,
-    gf_gld_mt_mop_stage_req_t = gf_common_mt_end + 19,
-    gf_gld_mt_probe_ctx_t = gf_common_mt_end + 20,
-    gf_gld_mt_create_volume_ctx_t = gf_common_mt_end + 21,
-    gf_gld_mt_start_volume_ctx_t = gf_common_mt_end + 22,
-    gf_gld_mt_stop_volume_ctx_t = gf_common_mt_end + 23,
-    gf_gld_mt_delete_volume_ctx_t = gf_common_mt_end + 24,
-    gf_gld_mt_glusterd_volinfo_t = gf_common_mt_end + 25,
-    gf_gld_mt_glusterd_brickinfo_t = gf_common_mt_end + 26,
-    gf_gld_mt_peer_hostname_t = gf_common_mt_end + 27,
-    gf_gld_mt_ifreq = gf_common_mt_end + 28,
-    gf_gld_mt_store_handle_t = gf_common_mt_end + 29,
-    gf_gld_mt_store_iter_t = gf_common_mt_end + 30,
-    gf_gld_mt_defrag_info = gf_common_mt_end + 31,
-    gf_gld_mt_log_filename_ctx_t = gf_common_mt_end + 32,
-    gf_gld_mt_log_locate_ctx_t = gf_common_mt_end + 33,
-    gf_gld_mt_log_rotate_ctx_t = gf_common_mt_end + 34,
-    gf_gld_mt_peerctx_t = gf_common_mt_end + 35,
-    gf_gld_mt_sm_tr_log_t = gf_common_mt_end + 36,
-    gf_gld_mt_pending_node_t = gf_common_mt_end + 37,
-    gf_gld_mt_brick_rsp_ctx_t = gf_common_mt_end + 38,
-    gf_gld_mt_mop_brick_req_t = gf_common_mt_end + 39,
-    gf_gld_mt_op_allack_ctx_t = gf_common_mt_end + 40,
-    gf_gld_mt_linearr = gf_common_mt_end + 41,
-    gf_gld_mt_linebuf = gf_common_mt_end + 42,
-    gf_gld_mt_mount_pattern = gf_common_mt_end + 43,
-    gf_gld_mt_mount_comp_container = gf_common_mt_end + 44,
-    gf_gld_mt_mount_component = gf_common_mt_end + 45,
-    gf_gld_mt_mount_spec = gf_common_mt_end + 46,
-    gf_gld_mt_georep_meet_spec = gf_common_mt_end + 47,
-    gf_gld_mt_nodesrv_t = gf_common_mt_end + 48,
-    gf_gld_mt_charptr = gf_common_mt_end + 49,
-    gf_gld_mt_hooks_stub_t = gf_common_mt_end + 50,
-    gf_gld_mt_hooks_priv_t = gf_common_mt_end + 51,
-    gf_gld_mt_mop_commit_req_t = gf_common_mt_end + 52,
-    gf_gld_mt_int = gf_common_mt_end + 53,
-    gf_gld_mt_snap_t = gf_common_mt_end + 54,
-    gf_gld_mt_missed_snapinfo_t = gf_common_mt_end + 55,
-    gf_gld_mt_snap_create_args_t = gf_common_mt_end + 56,
-    gf_gld_mt_local_peers_t = gf_common_mt_end + 57,
-    gf_gld_mt_glusterd_brick_proc_t = gf_common_mt_end + 58,
-    gf_gld_mt_end = gf_common_mt_end + 59,
+    gf_gld_mt_glusterd_conf_t = gf_common_mt_end + 1,
+    gf_gld_mt_char,
+    gf_gld_mt_peerinfo_t,
+    gf_gld_mt_friend_sm_event_t,
+    gf_gld_mt_friend_req_ctx_t,
+    gf_gld_mt_friend_update_ctx_t,
+    gf_gld_mt_op_sm_event_t,
+    gf_gld_mt_op_lock_ctx_t,
+    gf_gld_mt_op_stage_ctx_t,
+    gf_gld_mt_op_commit_ctx_t,
+    gf_gld_mt_mop_stage_req_t,
+    gf_gld_mt_probe_ctx_t,
+    gf_gld_mt_glusterd_volinfo_t,
+    gf_gld_mt_glusterd_brickinfo_t,
+    gf_gld_mt_peer_hostname_t,
+    gf_gld_mt_defrag_info,
+    gf_gld_mt_peerctx_t,
+    gf_gld_mt_sm_tr_log_t,
+    gf_gld_mt_pending_node_t,
+    gf_gld_mt_brick_rsp_ctx_t,
+    gf_gld_mt_mop_brick_req_t,
+    gf_gld_mt_op_allack_ctx_t,
+    gf_gld_mt_linearr,
+    gf_gld_mt_linebuf,
+    gf_gld_mt_mount_pattern,
+    gf_gld_mt_mount_comp_container,
+    gf_gld_mt_mount_spec,
+    gf_gld_mt_georep_meet_spec,
+    gf_gld_mt_charptr,
+    gf_gld_mt_hooks_stub_t,
+    gf_gld_mt_hooks_priv_t,
+    gf_gld_mt_mop_commit_req_t,
+    gf_gld_mt_int,
+    gf_gld_mt_snap_t,
+    gf_gld_mt_missed_snapinfo_t,
+    gf_gld_mt_snap_create_args_t,
+    gf_gld_mt_glusterd_brick_proc_t,
+    gf_gld_mt_end,
 } gf_gld_mem_types_t;
 #endif
diff --git a/xlators/nfs/server/src/nfs-mem-types.h b/xlators/nfs/server/src/nfs-mem-types.h
index 5737aae6a09..ea1d9323088 100644
--- a/xlators/nfs/server/src/nfs-mem-types.h
+++ b/xlators/nfs/server/src/nfs-mem-types.h
@@ -21,29 +21,22 @@ enum gf_nfs_mem_types_ {
     gf_nfs_mt_exportnode,
     gf_nfs_mt_groupnode,
     gf_nfs_mt_mount3_state,
-    gf_nfs_mt_write3args,
     gf_nfs_mt_nfs3_export,
     gf_nfs_mt_nfs3_state,
     gf_nfs_mt_entry3,
     gf_nfs_mt_entryp3,
-    gf_nfs_mt_nfs3_fd_entry,
     gf_nfs_mt_nfs3_fh,
     gf_nfs_mt_nfs_initer_list,
     gf_nfs_mt_xlator_t,
-    gf_nfs_mt_list_head,
     gf_nfs_mt_mnt3_resolve,
     gf_nfs_mt_mnt3_export,
     gf_nfs_mt_mnt3_auth_params,
     gf_nfs_mt_int,
     gf_nfs_mt_mountres3,
     gf_nfs_mt_mountstat3,
-    gf_nfs_mt_inode_q,
-    gf_nfs_mt_nlm4_state,
-    gf_nfs_mt_nlm4_cm,
     gf_nfs_mt_nlm4_fde,
     gf_nfs_mt_nlm4_nlmclnt,
     gf_nfs_mt_nlm4_share,
-    gf_nfs_mt_aux_gids,
     gf_nfs_mt_inode_ctx,
     gf_nfs_mt_auth_spec,
     gf_nfs_mt_arr,
diff --git a/xlators/performance/nl-cache/src/nl-cache-mem-types.h b/xlators/performance/nl-cache/src/nl-cache-mem-types.h
index bc61eeca9da..fa8c7775ef7 100644
--- a/xlators/performance/nl-cache/src/nl-cache-mem-types.h
+++ b/xlators/performance/nl-cache/src/nl-cache-mem-types.h
@@ -14,8 +14,7 @@
 #include "mem-types.h"
 
 enum gf_nlc_mem_types_ {
-    gf_nlc_mt_conf_t = gf_common_mt_end + 1,
-    gf_nlc_mt_nlc_conf_t,
+    gf_nlc_mt_nlc_conf_t = gf_common_mt_end + 1,
     gf_nlc_mt_nlc_ctx_t,
     gf_nlc_mt_nlc_local_t,
     gf_nlc_mt_nlc_pe_t,
diff --git a/xlators/performance/quick-read/src/quick-read-mem-types.h b/xlators/performance/quick-read/src/quick-read-mem-types.h
index 0ebd7e81c3a..5783132c28a 100644
--- a/xlators/performance/quick-read/src/quick-read-mem-types.h
+++ b/xlators/performance/quick-read/src/quick-read-mem-types.h
@@ -16,12 +16,8 @@
 enum gf_qr_mem_types_ {
     gf_qr_mt_qr_inode_t = gf_common_mt_end + 1,
     gf_qr_mt_content_t,
-    gf_qr_mt_qr_fd_ctx_t,
-    gf_qr_mt_iovec,
-    gf_qr_mt_qr_conf_t,
     gf_qr_mt_qr_priority_t,
     gf_qr_mt_qr_private_t,
-    gf_qr_mt_qr_unlink_ctx_t,
     gf_qr_mt_end
 };
 #endif
diff --git a/xlators/protocol/client/src/client-mem-types.h b/xlators/protocol/client/src/client-mem-types.h
index bf01a90abb9..715f981c31e 100644
--- a/xlators/protocol/client/src/client-mem-types.h
+++ b/xlators/protocol/client/src/client-mem-types.h
@@ -19,7 +19,6 @@ enum gf_client_mem_types_ {
     gf_client_mt_clnt_fdctx_t,
     gf_client_mt_clnt_lock_t,
     gf_client_mt_clnt_fd_lk_local_t,
-    gf_client_mt_clnt_args_t,
     gf_client_mt_compound_req_t,
     gf_client_mt_clnt_lock_request_t,
     gf_client_mt_end,
diff --git a/xlators/protocol/server/src/server-mem-types.h b/xlators/protocol/server/src/server-mem-types.h
index 4b341e53845..c4679c5587d 100644
--- a/xlators/protocol/server/src/server-mem-types.h
+++ b/xlators/protocol/server/src/server-mem-types.h
@@ -15,15 +15,9 @@
 
 enum gf_server_mem_types_ {
     gf_server_mt_server_conf_t = gf_common_mt_end + 1,
-    gf_server_mt_resolv_comp_t,
     gf_server_mt_state_t,
-    gf_server_mt_locker_t,
-    gf_server_mt_lock_table_t,
-    gf_server_mt_conn_t,
     gf_server_mt_dirent_rsp_t,
     gf_server_mt_rsp_buf_t,
-    gf_server_mt_volfile_ctx_t,
-    gf_server_mt_timer_data_t,
     gf_server_mt_setvolume_rsp_t,
     gf_server_mt_lock_mig_t,
     gf_server_mt_compound_rsp_t,
diff --git a/xlators/storage/posix/src/posix-mem-types.h b/xlators/storage/posix/src/posix-mem-types.h
index b9bd79ba3b8..07b51db9543 100644
--- a/xlators/storage/posix/src/posix-mem-types.h
+++ b/xlators/storage/posix/src/posix-mem-types.h
@@ -13,12 +13,9 @@
 #include "mem-types.h"
 
 enum gf_posix_mem_types_ {
-    gf_posix_mt_dir_entry_t = gf_common_mt_end + 1,
-    gf_posix_mt_posix_fd,
+    gf_posix_mt_posix_fd = gf_common_mt_end + 1,
     gf_posix_mt_char,
     gf_posix_mt_posix_private,
-    gf_posix_mt_int32_t,
-    gf_posix_mt_posix_dev_t,
     gf_posix_mt_trash_path,
     gf_posix_mt_paiocb,
     gf_posix_mt_inode_ctx_t,