diff options
| -rw-r--r-- | contrib/uuid/tst_uuid.c | 2 | ||||
| -rw-r--r-- | libglusterfs/src/Makefile.am | 2 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/Makefile.am | 2 | ||||
| -rw-r--r-- | xlators/protocol/legacy/lib/src/protocol.h | 33 |
4 files changed, 3 insertions, 36 deletions
diff --git a/contrib/uuid/tst_uuid.c b/contrib/uuid/tst_uuid.c index 7ac0207e5..e03138f7d 100644 --- a/contrib/uuid/tst_uuid.c +++ b/contrib/uuid/tst_uuid.c @@ -41,7 +41,7 @@ #include <stdio.h> #include <stdlib.h> -#include <uuid/uuid.h> +#include "uuid.h" static int test_uuid(const char * uuid, int isValid) { diff --git a/libglusterfs/src/Makefile.am b/libglusterfs/src/Makefile.am index af820f8c2..7a13d6955 100644 --- a/libglusterfs/src/Makefile.am +++ b/libglusterfs/src/Makefile.am @@ -1,6 +1,6 @@ libglusterfs_la_CFLAGS = -fPIC -Wall -g -shared -nostartfiles $(GF_CFLAGS) $(GF_DARWIN_LIBGLUSTERFS_CFLAGS) -libglusterfs_la_CPPFLAGS = -D_FILE_OFFSET_BITS=64 -D__USE_FILE_OFFSET64 -D_GNU_SOURCE -DXLATORDIR=\"$(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator\" -D$(GF_HOST_OS) -I$(CONTRIBDIR)/rbtree -DSCHEDULERDIR=\"$(libdir)/glusterfs/$(PACKAGE_VERSION)/scheduler\" -I$(CONTRIBDIR)/md5 +libglusterfs_la_CPPFLAGS = -D_FILE_OFFSET_BITS=64 -D__USE_FILE_OFFSET64 -D_GNU_SOURCE -DXLATORDIR=\"$(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator\" -D$(GF_HOST_OS) -I$(CONTRIBDIR)/rbtree -DSCHEDULERDIR=\"$(libdir)/glusterfs/$(PACKAGE_VERSION)/scheduler\" -I$(CONTRIBDIR)/md5 -I$(CONTRIBDIR)/uuid libglusterfs_la_LIBADD = @LEXLIB@ diff --git a/xlators/mgmt/glusterd/src/Makefile.am b/xlators/mgmt/glusterd/src/Makefile.am index 904e03669..d8b4e87d4 100644 --- a/xlators/mgmt/glusterd/src/Makefile.am +++ b/xlators/mgmt/glusterd/src/Makefile.am @@ -3,7 +3,7 @@ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/mgmt glusterd_la_LDFLAGS = -module -avoidversion glusterd_la_SOURCES = glusterd.c glusterd-handler.c glusterd-sm.c glusterd-op-sm.c \ glusterd-utils.c glusterd3_1-mops.c glusterd-ha.c -glusterd_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -luuid \ +glusterd_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la\ $(top_builddir)/rpc/xdr/src/libgfxdr.la\ $(top_builddir)/rpc/rpc-lib/src/libgfrpc.la diff --git a/xlators/protocol/legacy/lib/src/protocol.h b/xlators/protocol/legacy/lib/src/protocol.h index 85d175dd4..e929693d7 100644 --- a/xlators/protocol/legacy/lib/src/protocol.h +++ b/xlators/protocol/legacy/lib/src/protocol.h @@ -35,7 +35,6 @@ #include "byte-order.h" #include "iatt.h" -#include <uuid/uuid.h> /* Any changes in the protocol structure or adding new '[f,m]ops' needs to * bump the protocol version by "0.1" @@ -1035,38 +1034,6 @@ typedef struct { } __attribute__((packed)) gf_cbk_forget_req_t; typedef struct { } __attribute__((packed)) gf_cbk_forget_rsp_t; - - -typedef struct { - char volname[0]; - char exportpath[0]; -} __attribute__((packed)) gf_mop_create_volume_t; -typedef struct { -} __attribute__ ((packed))gf_mop_create_volume_rsp_t; - -typedef struct { - uuid_t uuid; -} __attribute__((packed)) gf_mop_cluster_lock_req_t; -typedef struct { - uuid_t uuid; -} __attribute__ ((packed))gf_mop_cluster_lock_rsp_t; - -typedef gf_mop_cluster_lock_req_t gf_mop_cluster_unlock_req_t; -typedef gf_mop_cluster_lock_rsp_t gf_mop_cluster_unlock_rsp_t; - -typedef struct { - uuid_t uuid; - int32_t op; - int32_t len; - char buf[0]; -} __attribute__((packed)) gf_mop_stage_req_t; -typedef struct { - uuid_t uuid; - int32_t op; -} __attribute__ ((packed))gf_mop_stage_rsp_t; - -typedef gf_mop_stage_rsp_t gf_mop_commit_rsp_t; - typedef struct { uint32_t pid; uint32_t uid; |