Upcall: Process each of the upcall events separately

As suggested during the code-review of Bug1200262, have modified
GF_CBK_UPCALL to be exlusively GF_CBK_CACHE_INVALIDATION.
Thus, for any new upcall event, a new CBK procedure will be added.

Also made changes to store upcall data separately based on the
upcall event type received.

BUG: 1217711
Change-Id: I0f5e53d6f5ece16aecb514a0a426dca40fa1c755
Signed-off-by: Soumya Koduri <skoduri@redhat.com>
Reviewed-on: http://review.gluster.org/10049
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Reviewed-on: http://review.gluster.org/10562
Tested-by: NetBSD Build System
Tested-by: Gluster Build System <jenkins@build.gluster.com>

1 files changed, 4 insertions, 14 deletions

diff --git a/api/src/glfs-internal.h b/api/src/glfs-internal.h
index faa53dd3225..20fbb5c3201 100644
--- a/api/src/glfs-internal.h
+++ b/api/src/glfs-internal.h
@@ -13,6 +13,7 @@
 #define _GLFS_INTERNAL_H
 
 #include "xlator.h"
+#include "glusterfs.h"
 
 #define GLFS_SYMLINK_MAX_FOLLOW 2048
 
@@ -108,22 +109,9 @@
 
 struct glfs;
 
-/* This enum should be in sync with
- * 'upcall_event_type' declared in
- * 'xlators/features/upcall/src/upcall.h'
- */
-enum upcall_event_type_t {
-        EVENT_NULL,
-        CACHE_INVALIDATION,
-};
-typedef enum upcall_event_type_t upcall_event_type;
-
 struct _upcall_entry_t {
         struct list_head  upcall_list;
-        uuid_t            gfid;
-        upcall_event_type event_type;
-        uint32_t          flags;
-        uint32_t          expire_time_attr;
+        struct gf_upcall  upcall_data;
 };
 typedef struct _upcall_entry_t upcall_entry;
 
@@ -345,5 +333,7 @@ struct glfs *glfs_new_from_ctx (glusterfs_ctx_t *ctx)
 void glfs_free_from_ctx (struct glfs *fs)
          GFAPI_PRIVATE(glfs_free_from_ctx, 3.7.0);
 
+int glfs_get_upcall_cache_invalidation (struct gf_upcall *to_up_data,
+                                        struct gf_upcall *from_up_data);
 
 #endif /* !_GLFS_INTERNAL_H */