diff options
Diffstat (limited to 'xlators/mgmt/glusterd')
| -rw-r--r-- | xlators/mgmt/glusterd/src/Makefile.am | 8 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/gd-xdr.c | 204 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/gd-xdr.h | 101 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-ha.c | 5 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-ha.h | 1 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-handler.c | 7 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-op-sm.c | 2 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-op-sm.h | 1 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-sm.h | 1 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-utils.h | 1 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd.h | 3 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd3_1-mops.c | 3 |
12 files changed, 15 insertions, 322 deletions
diff --git a/xlators/mgmt/glusterd/src/Makefile.am b/xlators/mgmt/glusterd/src/Makefile.am index defeca712..62435a319 100644 --- a/xlators/mgmt/glusterd/src/Makefile.am +++ b/xlators/mgmt/glusterd/src/Makefile.am @@ -2,16 +2,16 @@ xlator_LTLIBRARIES = glusterd.la 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 gd-xdr.c glusterd-ha.c + glusterd-utils.c glusterd3_1-mops.c glusterd-ha.c glusterd_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -luuid \ - $(top_builddir)/xlators/protocol/lib/src/libgfproto1.la\ + $(top_builddir)/rpc/xdr/src/libgfxdr.la\ $(top_builddir)/rpc/rpc-lib/src/libgfrpc.la -noinst_HEADERS = glusterd.h gd-xdr.h glusterd-utils.h glusterd-op-sm.h glusterd-sm.h glusterd-ha.h glusterd-mem-types.h +noinst_HEADERS = glusterd.h glusterd-utils.h glusterd-op-sm.h glusterd-sm.h glusterd-ha.h glusterd-mem-types.h AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS)\ -I$(top_srcdir)/libglusterfs/src -shared -nostartfiles $(GF_CFLAGS)\ - -I$(rpclibdir) -L$(xlatordir)/ -I$(CONTRIBDIR)/rbtree -I$(top_srcdir)/xlators/protocol/lib/src\ + -I$(rpclibdir) -L$(xlatordir)/ -I$(CONTRIBDIR)/rbtree -I$(top_srcdir)/rpc/xdr/src\ -I$(top_srcdir)/rpc/rpc-lib/src CLEANFILES = diff --git a/xlators/mgmt/glusterd/src/gd-xdr.c b/xlators/mgmt/glusterd/src/gd-xdr.c deleted file mode 100644 index c70c5697f..000000000 --- a/xlators/mgmt/glusterd/src/gd-xdr.c +++ /dev/null @@ -1,204 +0,0 @@ -/* - Copyright (c) 2007-2010 Gluster, Inc. <http://www.gluster.com> - This file is part of GlusterFS. - - GlusterFS is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3 of the License, - or (at your option) any later version. - - GlusterFS is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see - <http://www.gnu.org/licenses/>. -*/ - - -#include "gd-xdr.h" - - -ssize_t -gd_xdr_serialize_mgmt_probe_rsp (struct iovec outmsg, void *rsp) -{ - return xdr_serialize_generic (outmsg, (void *)rsp, - (xdrproc_t)xdr_gd1_mgmt_probe_rsp); - -} - -ssize_t -gd_xdr_serialize_mgmt_friend_rsp (struct iovec outmsg, void *rsp) -{ - return xdr_serialize_generic (outmsg, (void *)rsp, - (xdrproc_t)xdr_gd1_mgmt_friend_rsp); - -} - -ssize_t -gd_xdr_serialize_mgmt_cluster_lock_rsp (struct iovec outmsg, void *rsp) -{ - return xdr_serialize_generic (outmsg, (void *)rsp, - (xdrproc_t)xdr_gd1_mgmt_cluster_lock_rsp); - -} - -ssize_t -gd_xdr_serialize_mgmt_cluster_unlock_rsp (struct iovec outmsg, void *rsp) -{ - return xdr_serialize_generic (outmsg, (void *)rsp, - (xdrproc_t)xdr_gd1_mgmt_cluster_unlock_rsp); - -} - -ssize_t -gd_xdr_serialize_mgmt_stage_op_rsp (struct iovec outmsg, void *rsp) -{ - return xdr_serialize_generic (outmsg, (void *)rsp, - (xdrproc_t)xdr_gd1_mgmt_stage_op_rsp); - -} - -ssize_t -gd_xdr_serialize_mgmt_commit_op_rsp (struct iovec outmsg, void *rsp) -{ - return xdr_serialize_generic (outmsg, (void *)rsp, - (xdrproc_t)xdr_gd1_mgmt_commit_op_rsp); - -} -/* Decode */ - - -ssize_t -gd_xdr_to_mgmt_probe_req (struct iovec inmsg, void *args) -{ - return xdr_to_generic (inmsg, (void *)args, - (xdrproc_t)xdr_gd1_mgmt_probe_req); -} - -ssize_t -gd_xdr_to_mgmt_friend_req (struct iovec inmsg, void *args) -{ - return xdr_to_generic (inmsg, (void *)args, - (xdrproc_t)xdr_gd1_mgmt_friend_req); -} - -ssize_t -gd_xdr_to_mgmt_cluster_lock_req (struct iovec inmsg, void *args) -{ - return xdr_to_generic (inmsg, (void *)args, - (xdrproc_t)xdr_gd1_mgmt_cluster_lock_req); -} - -ssize_t -gd_xdr_to_mgmt_cluster_unlock_req (struct iovec inmsg, void *args) -{ - return xdr_to_generic (inmsg, (void *)args, - (xdrproc_t)xdr_gd1_mgmt_cluster_unlock_req); -} - -ssize_t -gd_xdr_to_mgmt_stage_op_req (struct iovec inmsg, void *args) -{ - return xdr_to_generic (inmsg, (void *)args, - (xdrproc_t)xdr_gd1_mgmt_stage_op_req); -} - - -ssize_t -gd_xdr_to_mgmt_commit_op_req (struct iovec inmsg, void *args) -{ - return xdr_to_generic (inmsg, (void *)args, - (xdrproc_t)xdr_gd1_mgmt_commit_op_req); -} - -ssize_t -gd_xdr_to_mgmt_probe_rsp (struct iovec inmsg, void *args) -{ - return xdr_to_generic (inmsg, (void *)args, - (xdrproc_t)xdr_gd1_mgmt_probe_rsp); -} - -ssize_t -gd_xdr_to_mgmt_friend_rsp (struct iovec inmsg, void *args) -{ - return xdr_to_generic (inmsg, (void *)args, - (xdrproc_t)xdr_gd1_mgmt_friend_rsp); -} - -ssize_t -gd_xdr_to_mgmt_cluster_lock_rsp (struct iovec inmsg, void *args) -{ - return xdr_to_generic (inmsg, (void *)args, - (xdrproc_t)xdr_gd1_mgmt_cluster_lock_rsp); -} - -ssize_t -gd_xdr_to_mgmt_cluster_unlock_rsp (struct iovec inmsg, void *args) -{ - return xdr_to_generic (inmsg, (void *)args, - (xdrproc_t)xdr_gd1_mgmt_cluster_unlock_rsp); -} - -ssize_t -gd_xdr_to_mgmt_stage_op_rsp (struct iovec inmsg, void *args) -{ - return xdr_to_generic (inmsg, (void *)args, - (xdrproc_t)xdr_gd1_mgmt_stage_op_rsp); -} - -ssize_t -gd_xdr_to_mgmt_commit_op_rsp (struct iovec inmsg, void *args) -{ - return xdr_to_generic (inmsg, (void *)args, - (xdrproc_t)xdr_gd1_mgmt_commit_op_rsp); -} - -ssize_t -gd_xdr_from_mgmt_probe_req (struct iovec outmsg, void *req) -{ - return xdr_serialize_generic (outmsg, (void *)req, - (xdrproc_t)xdr_gd1_mgmt_probe_req); - -} - -ssize_t -gd_xdr_from_mgmt_friend_req (struct iovec outmsg, void *req) -{ - return xdr_serialize_generic (outmsg, (void *)req, - (xdrproc_t)xdr_gd1_mgmt_friend_req); - -} - -ssize_t -gd_xdr_from_mgmt_cluster_lock_req (struct iovec outmsg, void *req) -{ - return xdr_serialize_generic (outmsg, (void *)req, - (xdrproc_t)xdr_gd1_mgmt_cluster_lock_req); - -} - -ssize_t -gd_xdr_from_mgmt_cluster_unlock_req (struct iovec outmsg, void *req) -{ - return xdr_serialize_generic (outmsg, (void *)req, - (xdrproc_t)xdr_gd1_mgmt_cluster_unlock_req); - -} - -ssize_t -gd_xdr_from_mgmt_stage_op_req (struct iovec outmsg, void *req) -{ - return xdr_serialize_generic (outmsg, (void *)req, - (xdrproc_t)xdr_gd1_mgmt_stage_op_req); -} - - -ssize_t -gd_xdr_from_mgmt_commit_op_req (struct iovec outmsg, void *req) -{ - return xdr_serialize_generic (outmsg, (void *)req, - (xdrproc_t)xdr_gd1_mgmt_commit_op_req); -} diff --git a/xlators/mgmt/glusterd/src/gd-xdr.h b/xlators/mgmt/glusterd/src/gd-xdr.h deleted file mode 100644 index 911edcf78..000000000 --- a/xlators/mgmt/glusterd/src/gd-xdr.h +++ /dev/null @@ -1,101 +0,0 @@ -/* - Copyright (c) 2007-2010 Gluster, Inc. <http://www.gluster.com> - This file is part of GlusterFS. - - GlusterFS is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3 of the License, - or (at your option) any later version. - - GlusterFS is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see - <http://www.gnu.org/licenses/>. -*/ - - -#ifndef _MSG_GD_XDR_H -#define _MSG_GD_XDR_H - -#include <sys/uio.h> - -#include "msg-xdr.h" -#include "glusterd1.h" - -ssize_t -gd_xdr_to_mgmt_probe_req (struct iovec inmsg, void *args); - -ssize_t -gd_xdr_to_mgmt_probe_rsp (struct iovec inmsg, void *args); - -ssize_t -gd_xdr_serialize_mgmt_probe_rsp (struct iovec outmsg, void *rsp); - -ssize_t -gd_xdr_from_mgmt_probe_req (struct iovec outmsg, void *req); - -ssize_t -gd_xdr_to_mgmt_friend_req (struct iovec inmsg, void *args); - -ssize_t -gd_xdr_to_mgmt_friend_rsp (struct iovec inmsg, void *args); - -ssize_t -gd_xdr_serialize_mgmt_friend_rsp (struct iovec outmsg, void *rsp); - -ssize_t -gd_xdr_from_mgmt_friend_req (struct iovec outmsg, void *req); - -ssize_t -gd_xdr_to_mgmt_cluster_lock_req (struct iovec inmsg, void *args); - -ssize_t -gd_xdr_to_mgmt_cluster_lock_rsp (struct iovec inmsg, void *args); - -ssize_t -gd_xdr_serialize_mgmt_cluster_lock_rsp (struct iovec outmsg, void *rsp); - -ssize_t -gd_xdr_from_mgmt_cluster_lock_req (struct iovec outmsg, void *req); - -ssize_t -gd_xdr_to_mgmt_cluster_unlock_req (struct iovec inmsg, void *args); - -ssize_t -gd_xdr_to_mgmt_cluster_unlock_rsp (struct iovec inmsg, void *args); - -ssize_t -gd_xdr_serialize_mgmt_cluster_unlock_rsp (struct iovec outmsg, void *rsp); - -ssize_t -gd_xdr_from_mgmt_cluster_unlock_req (struct iovec outmsg, void *req); - -ssize_t -gd_xdr_to_mgmt_stage_op_req (struct iovec inmsg, void *args); - -ssize_t -gd_xdr_to_mgmt_stage_op_rsp (struct iovec inmsg, void *args); - -ssize_t -gd_xdr_serialize_mgmt_stage_op_rsp (struct iovec outmsg, void *rsp); - -ssize_t -gd_xdr_from_mgmt_stage_op_req (struct iovec outmsg, void *req); - -ssize_t -gd_xdr_to_mgmt_commit_op_req (struct iovec inmsg, void *args); - -ssize_t -gd_xdr_to_mgmt_commit_op_rsp (struct iovec inmsg, void *args); - -ssize_t -gd_xdr_serialize_mgmt_commit_op_rsp (struct iovec outmsg, void *rsp); - -ssize_t -gd_xdr_from_mgmt_commit_op_req (struct iovec outmsg, void *req); - -#endif /* !_MSG_GD_XDR_H */ diff --git a/xlators/mgmt/glusterd/src/glusterd-ha.c b/xlators/mgmt/glusterd/src/glusterd-ha.c index 398ecce57..49e73703d 100644 --- a/xlators/mgmt/glusterd/src/glusterd-ha.c +++ b/xlators/mgmt/glusterd/src/glusterd-ha.c @@ -42,8 +42,9 @@ #include "glusterd-op-sm.h" #include "glusterd-utils.h" #include "glusterd-ha.h" -#include "gd-xdr.h" -#include "cli-xdr.h" + +#include "glusterd1.h" +#include "cli1.h" #include "rpc-clnt.h" #include <sys/resource.h> diff --git a/xlators/mgmt/glusterd/src/glusterd-ha.h b/xlators/mgmt/glusterd/src/glusterd-ha.h index 6b01f9060..42684f073 100644 --- a/xlators/mgmt/glusterd/src/glusterd-ha.h +++ b/xlators/mgmt/glusterd/src/glusterd-ha.h @@ -32,7 +32,6 @@ #include "xlator.h" #include "logging.h" #include "call-stub.h" -#include "authenticate.h" #include "fd.h" #include "byte-order.h" #include "glusterd.h" diff --git a/xlators/mgmt/glusterd/src/glusterd-handler.c b/xlators/mgmt/glusterd/src/glusterd-handler.c index db385d7bb..086e62e4e 100644 --- a/xlators/mgmt/glusterd/src/glusterd-handler.c +++ b/xlators/mgmt/glusterd/src/glusterd-handler.c @@ -41,10 +41,11 @@ #include "glusterd-sm.h" #include "glusterd-op-sm.h" #include "glusterd-utils.h" -#include "gd-xdr.h" -#include "cli-xdr.h" + +#include "glusterd1.h" +#include "cli1.h" #include "rpc-clnt.h" -#include "gluster1.h" +#include "glusterd1-xdr.h" #include <sys/resource.h> #include <inttypes.h> diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.c b/xlators/mgmt/glusterd/src/glusterd-op-sm.c index a9417d3ff..9ecb798ed 100644 --- a/xlators/mgmt/glusterd/src/glusterd-op-sm.c +++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.c @@ -44,7 +44,7 @@ #include "glusterd-op-sm.h" #include "glusterd-utils.h" #include "glusterd-ha.h" -#include "gluster1.h" +#include "cli1.h" static struct list_head gd_op_sm_queue; glusterd_op_info_t opinfo; diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.h b/xlators/mgmt/glusterd/src/glusterd-op-sm.h index e080acee7..b23fafb38 100644 --- a/xlators/mgmt/glusterd/src/glusterd-op-sm.h +++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.h @@ -32,7 +32,6 @@ #include "xlator.h" #include "logging.h" #include "call-stub.h" -#include "authenticate.h" #include "fd.h" #include "byte-order.h" #include "glusterd.h" diff --git a/xlators/mgmt/glusterd/src/glusterd-sm.h b/xlators/mgmt/glusterd/src/glusterd-sm.h index 6f03a8497..36f7a043b 100644 --- a/xlators/mgmt/glusterd/src/glusterd-sm.h +++ b/xlators/mgmt/glusterd/src/glusterd-sm.h @@ -33,7 +33,6 @@ #include "xlator.h" #include "logging.h" #include "call-stub.h" -#include "authenticate.h" #include "fd.h" #include "byte-order.h" //#include "glusterd.h" diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.h b/xlators/mgmt/glusterd/src/glusterd-utils.h index 8007fa72d..dbc22f627 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.h +++ b/xlators/mgmt/glusterd/src/glusterd-utils.h @@ -32,7 +32,6 @@ #include "xlator.h" #include "logging.h" #include "call-stub.h" -#include "authenticate.h" #include "fd.h" #include "byte-order.h" #include "glusterd.h" diff --git a/xlators/mgmt/glusterd/src/glusterd.h b/xlators/mgmt/glusterd/src/glusterd.h index dcc2cd0fd..f7f1acca7 100644 --- a/xlators/mgmt/glusterd/src/glusterd.h +++ b/xlators/mgmt/glusterd/src/glusterd.h @@ -33,13 +33,12 @@ #include "xlator.h" #include "logging.h" #include "call-stub.h" -#include "authenticate.h" #include "fd.h" #include "byte-order.h" #include "glusterd-mem-types.h" #include "rpcsvc.h" #include "glusterd-sm.h" -#include "glusterd1.h" +#include "glusterd1-xdr.h" diff --git a/xlators/mgmt/glusterd/src/glusterd3_1-mops.c b/xlators/mgmt/glusterd/src/glusterd3_1-mops.c index 5c2bcf250..29e1dd625 100644 --- a/xlators/mgmt/glusterd/src/glusterd3_1-mops.c +++ b/xlators/mgmt/glusterd/src/glusterd3_1-mops.c @@ -24,8 +24,9 @@ #endif #include "rpc-clnt.h" +#include "glusterd1-xdr.h" #include "glusterd1.h" -#include "gd-xdr.h" + #include "compat-errno.h" #include "glusterd-op-sm.h" #include "glusterd-sm.h" |