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: 1200262
Change-Id: I0f5e53d6f5ece16aecb514a0a426dca40fa1c755
Signed-off-by: Soumya Koduri <skoduri@redhat.com>
Reviewed-on: http://review.gluster.org/10049
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>

1 files changed, 13 insertions, 3 deletions

diff --git a/libglusterfs/src/glusterfs.h b/libglusterfs/src/glusterfs.h
index 5ca09151ae8..9926d314874 100644
--- a/libglusterfs/src/glusterfs.h
+++ b/libglusterfs/src/glusterfs.h
@@ -37,6 +37,7 @@
 #include "list.h"
 #include "logging.h"
 #include "lkowner.h"
+#include "compat-uuid.h"
 
 #define GF_YES 1
 #define GF_NO  0
@@ -370,6 +371,11 @@ typedef enum {
 } gf_xattrop_flags_t;
 
 
+typedef enum {
+        GF_UPCALL_EVENT_NULL,
+        GF_UPCALL_CACHE_INVALIDATION,
+} gf_upcall_event_t;
+
 #define GF_SET_IF_NOT_PRESENT 0x1 /* default behaviour */
 #define GF_SET_OVERWRITE      0x2 /* Overwrite with the buf given */
 #define GF_SET_DIR_ONLY       0x4
@@ -617,9 +623,13 @@ struct gf_flock {
 };
 
 struct gf_upcall {
-        char  *client_uid;
-	char  gfid[16];
-        u_int event_type;
+        char   *client_uid;
+        uuid_t gfid;
+        u_int  event_type;
+        void   *data;
+};
+
+struct gf_upcall_cache_invalidation {
         u_int flags;
         u_int expire_time_attr;
 };