X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Factions%2Fsnapshot-session.c;h=7576838650609b245f25f202ca491b3084797d50;hp=058179633db411d6e29c42fc52c59af24b13fc94;hb=2463b7879c00298daa79744cdaae82ac061a4ed8;hpb=0c51e8f329cdd907761e34c3e4394200a56c6812

diff --git a/src/common/actions/snapshot-session.c b/src/common/actions/snapshot-session.c
index 058179633..757683865 100644
--- a/src/common/actions/snapshot-session.c
+++ b/src/common/actions/snapshot-session.c
@@ -9,8 +9,8 @@
 #include <common/error.h>
 #include <common/macros.h>
 #include <common/snapshot.h>
-#include <common/sessiond-comm/payload.h>
-#include <common/sessiond-comm/payload-view.h>
+#include <common/payload.h>
+#include <common/payload-view.h>
 #include <lttng/action/action-internal.h>
 #include <lttng/action/snapshot-session-internal.h>
 #include <lttng/action/snapshot-session.h>
@@ -19,7 +19,7 @@
 #include <inttypes.h>
 
 #define IS_SNAPSHOT_SESSION_ACTION(action) \
-	(lttng_action_get_type_const(action) == LTTNG_ACTION_TYPE_SNAPSHOT_SESSION)
+	(lttng_action_get_type(action) == LTTNG_ACTION_TYPE_SNAPSHOT_SESSION)
 
 struct lttng_action_snapshot_session {
 	struct lttng_action parent;
@@ -141,7 +141,6 @@ static int lttng_action_snapshot_session_serialize(
 	assert(payload);
 
 	size_before_comm = payload->buffer.size;
-	size_before_comm = size_before_comm + sizeof(comm);
 
 	action_snapshot_session = action_snapshot_session_from_action(action);
 	comm.session_name_len =