summaryrefslogtreecommitdiffstats
path: root/tests/basic
diff options
context:
space:
mode:
authorJiffin Tony Thottan <jthottan@redhat.com>2016-06-10 18:23:43 +0530
committerJeff Darcy <jdarcy@redhat.com>2016-06-10 14:09:32 -0700
commit2775dc64101ed37c8d9809bf9852dbf0746ee2b6 (patch)
tree99aa09e79384cd5f8ff8f5a50667f6aa2f9f1f9d /tests/basic
parent3474aa85e399a92d3ee9159a2d066d4bd73611a0 (diff)
libgfapi/upcall : prepend "glfs_" to callback_arg, callback_inode_arg
Change-Id: I371525775db4f6a4d69beb94baaa53d17b16fb41 BUG: 1344714 Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com> Reviewed-on: http://review.gluster.org/14702 CentOS-regression: Gluster Build System <jenkins@build.gluster.com> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> Reviewed-by: Jeff Darcy <jdarcy@redhat.com> Tested-by: Jeff Darcy <jdarcy@redhat.com> Smoke: Gluster Build System <jenkins@build.gluster.com>
Diffstat (limited to 'tests/basic')
-rw-r--r--tests/basic/gfapi/bug1283983.c4
-rw-r--r--tests/basic/gfapi/bug1291259.c6
-rw-r--r--tests/basic/gfapi/upcall-cache-invalidate.c4
3 files changed, 7 insertions, 7 deletions
diff --git a/tests/basic/gfapi/bug1283983.c b/tests/basic/gfapi/bug1283983.c
index 76db8d5ca09..ba0f954cb17 100644
--- a/tests/basic/gfapi/bug1283983.c
+++ b/tests/basic/gfapi/bug1283983.c
@@ -38,11 +38,11 @@ main (int argc, char *argv[])
char *filename = "/a1";
char *filename2 = "/a2";
struct stat sb = {0, };
- struct callback_arg cbk;
+ struct glfs_callback_arg cbk;
char *logfile = NULL;
char *volname = NULL;
int cnt = 1;
- struct callback_inode_arg *in_arg = NULL;
+ struct glfs_callback_inode_arg *in_arg = NULL;
struct glfs_object *root = NULL, *leaf = NULL;
cbk.reason = 0;
diff --git a/tests/basic/gfapi/bug1291259.c b/tests/basic/gfapi/bug1291259.c
index 35f39938cb3..333da20f557 100644
--- a/tests/basic/gfapi/bug1291259.c
+++ b/tests/basic/gfapi/bug1291259.c
@@ -41,12 +41,12 @@ main (int argc, char *argv[])
char *filename = "/a1";
char *filename2 = "/a2";
struct stat sb = {0, };
- struct callback_arg cbk;
+ struct glfs_callback_arg cbk;
char *logfile = NULL;
char *volname = NULL;
int cnt = 1;
int upcall_received = 0;
- struct callback_inode_arg *in_arg = NULL;
+ struct glfs_callback_inode_arg *in_arg = NULL;
struct glfs_object *root = NULL, *leaf = NULL;
unsigned char globjhdl[GFAPI_HANDLE_LENGTH];
unsigned char globjhdl2[GFAPI_HANDLE_LENGTH];
@@ -124,7 +124,7 @@ main (int argc, char *argv[])
if (cbk.reason == GFAPI_INODE_INVALIDATE) {
fprintf (stderr, "Upcall received(%d)\n",
cbk.reason);
- in_arg = (struct callback_inode_arg *)(cbk.event_arg);
+ in_arg = (struct glfs_callback_inode_arg *)(cbk.event_arg);
ret = glfs_h_extract_handle (root,
globjhdl+GLAPI_UUID_LENGTH,
diff --git a/tests/basic/gfapi/upcall-cache-invalidate.c b/tests/basic/gfapi/upcall-cache-invalidate.c
index cc2e6a0fe33..deec691bf8e 100644
--- a/tests/basic/gfapi/upcall-cache-invalidate.c
+++ b/tests/basic/gfapi/upcall-cache-invalidate.c
@@ -38,10 +38,10 @@ main (int argc, char *argv[])
char *writebuf = NULL;
char *vol_id = NULL;
unsigned int cnt = 1;
- struct callback_arg cbk;
+ struct glfs_callback_arg cbk;
char *logfile = NULL;
char *volname = NULL;
- struct callback_inode_arg *in_arg = NULL;
+ struct glfs_callback_inode_arg *in_arg = NULL;
cbk.reason = 0;