diff options
| -rw-r--r-- | rpc/rpc-lib/src/Makefile.am | 3 | ||||
| -rw-r--r-- | rpc/rpc-transport/socket/src/Makefile.am | 4 | ||||
| -rw-r--r-- | xlators/features/quota/src/Makefile.am | 6 | ||||
| -rw-r--r-- | xlators/mount/fuse/src/Makefile.am | 2 | ||||
| -rw-r--r-- | xlators/protocol/server/src/server.c | 2 |
5 files changed, 11 insertions, 6 deletions
diff --git a/rpc/rpc-lib/src/Makefile.am b/rpc/rpc-lib/src/Makefile.am index b9e55c7ab8a..c07d001b057 100644 --- a/rpc/rpc-lib/src/Makefile.am +++ b/rpc/rpc-lib/src/Makefile.am @@ -4,7 +4,8 @@ libgfrpc_la_SOURCES = auth-unix.c rpcsvc-auth.c rpcsvc.c auth-null.c \ rpc-transport.c xdr-rpc.c xdr-rpcclnt.c rpc-clnt.c auth-glusterfs.c \ rpc-drc.c $(CONTRIBDIR)/sunrpc/xdr_sizeof.c rpc-clnt-ping.c -libgfrpc_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la +libgfrpc_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \ + $(top_builddir)/rpc/xdr/src/libgfxdr.la libgfrpc_la_LDFLAGS = -version-info $(LIBGFRPC_LT_VERSION) $(GF_LDFLAGS) libgfrpc_la_HEADERS = rpcsvc.h rpc-transport.h xdr-common.h xdr-rpc.h xdr-rpcclnt.h \ diff --git a/rpc/rpc-transport/socket/src/Makefile.am b/rpc/rpc-transport/socket/src/Makefile.am index ed0697635da..a1c9a6120f1 100644 --- a/rpc/rpc-transport/socket/src/Makefile.am +++ b/rpc/rpc-transport/socket/src/Makefile.am @@ -6,7 +6,9 @@ rpctransportdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/rpc-transport socket_la_LDFLAGS = -module -avoid-version socket_la_SOURCES = socket.c name.c -socket_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -lssl +socket_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \ + $(top_builddir)/rpc/xdr/src/libgfxdr.la \ + -lssl AM_CPPFLAGS = $(GF_CPPFLAGS) \ -I$(top_srcdir)/libglusterfs/src \ diff --git a/xlators/features/quota/src/Makefile.am b/xlators/features/quota/src/Makefile.am index f261aaff8a1..6c1372b4421 100644 --- a/xlators/features/quota/src/Makefile.am +++ b/xlators/features/quota/src/Makefile.am @@ -5,10 +5,12 @@ quota_la_LDFLAGS = -module $(GF_XLATOR_DEFAULT_LDFLAGS) quotad_la_LDFLAGS = -module -avoid-version -export-symbols $(top_srcdir)/xlators/features/quota/src/quotad.sym quota_la_SOURCES = quota.c quota-enforcer-client.c -quota_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la +quota_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \ + $(top_builddir)/rpc/xdr/src/libgfxdr.la quotad_la_SOURCES = quotad.c quotad-helpers.c quotad-aggregator.c -quotad_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la +quotad_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \ + $(top_builddir)/rpc/xdr/src/libgfxdr.la noinst_HEADERS = quota-mem-types.h quota.h quotad-aggregator.h \ quotad-helpers.h quota-messages.h diff --git a/xlators/mount/fuse/src/Makefile.am b/xlators/mount/fuse/src/Makefile.am index 9392dec9d86..7018cad37f6 100644 --- a/xlators/mount/fuse/src/Makefile.am +++ b/xlators/mount/fuse/src/Makefile.am @@ -27,7 +27,7 @@ fuse_la_SOURCES = fuse-helpers.c fuse-resolve.c fuse-bridge.c \ $(CONTRIBDIR)/fuse-lib/misc.c $(mount_source) fuse_la_LDFLAGS = -module $(GF_XLATOR_DEFAULT_LDFLAGS) -fuse_la_LIBADD = $(GF_LDADD) @GF_FUSE_LDADD@ +fuse_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(GF_LDADD) @GF_FUSE_LDADD@ AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \ -I$(top_srcdir)/rpc/xdr/src -I$(top_builddir)/rpc/xdr/src \ diff --git a/xlators/protocol/server/src/server.c b/xlators/protocol/server/src/server.c index 4d89fe89b2c..b714d54dc97 100644 --- a/xlators/protocol/server/src/server.c +++ b/xlators/protocol/server/src/server.c @@ -1562,7 +1562,7 @@ notify (xlator_t *this, int32_t event, void *data, ...) UNLOCK (&ctx->volfile_lock); if (victim_found) (*trav_p) = (*trav_p)->next; - glusterfs_mgmt_pmap_signout (glusterfsd_ctx, + glusterfs_mgmt_pmap_signout (ctx, victim->name); glusterfs_autoscale_threads (THIS->ctx, -1); default_notify (victim, GF_EVENT_CLEANUP, data); |