diff options
| author | Niels de Vos <ndevos@redhat.com> | 2015-06-28 10:15:44 +0200 |
|---|---|---|
| committer | Niels de Vos <ndevos@redhat.com> | 2015-06-28 01:25:24 -0700 |
| commit | b147ebb158c9f516ae2d815aaf1cd270efd5ebcb (patch) | |
| tree | 61c914790809afb4a040df09f319d28ef0cf9c33 /libglusterfs | |
| parent | 049c8eec304d9548fccb127ee8ce82f179bc41b0 (diff) | |
Revert "Upcall/gfapi: Return ENOTSUP when upcall feature is disabled"
This reverts commit b68f671b2b8a0aafef8f98145aee7044edaa907d from
http://review.gluster.org/11196 . The change depends on modifications to
the cluster xlators, but these are still partially under review.
Dropping this change now, it causes regression tests to fail.
Change-Id: If5ae4a519c9c6312cdb2e2a31acce4b1901f9442
BUG: 1231132
Signed-off-by: Soumya Koduri <skoduri@redhat.com>
Signed-off-by: Niels de Vos <ndevos@redhat.com>
Reviewed-on: http://review.gluster.org/11452
Diffstat (limited to 'libglusterfs')
| -rw-r--r-- | libglusterfs/src/common-utils.h | 1 | ||||
| -rw-r--r-- | libglusterfs/src/upcall-utils.h | 15 |
2 files changed, 2 insertions, 14 deletions
diff --git a/libglusterfs/src/common-utils.h b/libglusterfs/src/common-utils.h index 9b07e8c7565..86ea42ee849 100644 --- a/libglusterfs/src/common-utils.h +++ b/libglusterfs/src/common-utils.h @@ -125,7 +125,6 @@ enum _gf_client_pid enum _gf_xlator_ipc_targets { GF_IPC_TARGET_CHANGELOG = 0, - GF_IPC_UPCALL_FEATURES = 1, }; typedef enum _gf_boolean gf_boolean_t; diff --git a/libglusterfs/src/upcall-utils.h b/libglusterfs/src/upcall-utils.h index 5f6970fe7e1..001566fd85e 100644 --- a/libglusterfs/src/upcall-utils.h +++ b/libglusterfs/src/upcall-utils.h @@ -15,20 +15,9 @@ #include "compat-uuid.h" #include "compat.h" -/* Used by GF_IPC_UPCALL_FEATURES in the ipc() FOP. - * - * Each feature is a bit in the uint32_t, this likely will match all the events - * from the gf_upcall_event_t enum. - * - * When the bit for GF_UPCALL_EVENT_NULL is not set, upcall is loaded, but - * disabled. - */ -#define GF_UPCALL_FEATURES "gluster.upcall.features" - typedef enum { - GF_UPCALL_EVENT_NULL = 0, - GF_UPCALL_CACHE_INVALIDATION = 1, - /* add new events to the feature mask in up_ipc() */ + GF_UPCALL_EVENT_NULL, + GF_UPCALL_CACHE_INVALIDATION, } gf_upcall_event_t; struct gf_upcall { |