From 98a672f5046620f5fc751ea803e0dfa0bf4e18d3 Mon Sep 17 00:00:00 2001 From: Yaniv Kaul Date: Thu, 29 Nov 2018 22:27:59 +0200 Subject: 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 Change-Id: I8252bd763dc1506e2d922496d896cd2fc0886ea7 --- xlators/features/index/src/index-mem-types.h | 6 +++--- xlators/features/leases/src/leases-mem-types.h | 3 +-- xlators/features/locks/src/locks-mem-types.h | 1 - xlators/features/marker/src/marker-mem-types.h | 1 + xlators/features/quota/src/quota-mem-types.h | 1 + 5 files changed, 6 insertions(+), 6 deletions(-) (limited to 'xlators/features') 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, -- cgit