summaryrefslogtreecommitdiffstats
path: root/xlators/features/upcall
diff options
context:
space:
mode:
authorNiels de Vos <ndevos@redhat.com>2015-06-28 10:15:44 +0200
committerNiels de Vos <ndevos@redhat.com>2015-06-28 01:25:24 -0700
commitb147ebb158c9f516ae2d815aaf1cd270efd5ebcb (patch)
tree61c914790809afb4a040df09f319d28ef0cf9c33 /xlators/features/upcall
parent049c8eec304d9548fccb127ee8ce82f179bc41b0 (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 'xlators/features/upcall')
-rw-r--r--xlators/features/upcall/src/upcall.c49
1 files changed, 0 insertions, 49 deletions
diff --git a/xlators/features/upcall/src/upcall.c b/xlators/features/upcall/src/upcall.c
index bb29866543b..4954d43db07 100644
--- a/xlators/features/upcall/src/upcall.c
+++ b/xlators/features/upcall/src/upcall.c
@@ -1552,52 +1552,6 @@ err:
}
int32_t
-up_ipc (call_frame_t *frame, xlator_t *this, int32_t op, dict_t *xdata)
-{
- int ret = 0;
- uint32_t features = 0;
-
- /* upcall only has one IPC operation */
- if (op != GF_IPC_UPCALL_FEATURES)
- goto wind;
-
- if (!xdata) {
- xdata = dict_new();
- if (!xdata) {
- ret = -1;
- goto unwind;
- }
- } else {
- /* take an extra reference so that we can unconditionally unref
- * it later */
- dict_ref (xdata);
- }
-
- /* build the feature bitmask */
- if (is_upcall_enabled(this))
- features |= (1 << GF_UPCALL_EVENT_NULL);
-
- /* check if 'GF_UPCALL_CACHE_INVALIDATION' is available */
- if (is_cache_invalidation_enabled(this))
- features |= (1 << GF_UPCALL_CACHE_INVALIDATION);
-
- ret = dict_set_uint32 (xdata, GF_UPCALL_FEATURES, features);
-
-unwind:
- UPCALL_STACK_UNWIND (ipc, frame, ret, errno, xdata);
-
- dict_unref (xdata);
-
- return 0;
-
-wind:
- STACK_WIND (frame, default_ipc_cbk, FIRST_CHILD(this),
- FIRST_CHILD(this)->fops->ipc, op, xdata);
-
- return 0;
-}
-
-int32_t
mem_acct_init (xlator_t *this)
{
int ret = -1;
@@ -1859,9 +1813,6 @@ struct xlator_fops fops = {
.rmdir = up_rmdir,
.rename = up_rename,
- /* xlator internal communication */
- .ipc = up_ipc,
-
#ifdef NOT_SUPPORTED
/* internal lk fops */
.inodelk = up_inodelk,