From 0a6fe8551ac9807a8b6ad62241ec8048cf9f9025 Mon Sep 17 00:00:00 2001
From: Yaniv Kaul <ykaul@redhat.com>
Date: Sun, 9 Jun 2019 13:31:31 +0300
Subject: multiple files: another attempt to remove includes

There are many include statements that are not needed.
A previous more ambitious attempt failed because of *BSD plafrom
(see https://review.gluster.org/#/c/glusterfs/+/21929/ )

Now trying a more conservative reduction.
It does not solve all circular deps that we have, but it
does reduce some of them. There is just too much to handle
reasonably (dht-common.h includes dht-lock.h which includes
dht-common.h ...), but it does reduce the overall number of lines
of include we need to look at in the future to understand and fix
the mess later one.

Change-Id: I550cd001bdefb8be0fe67632f783c0ef6bee3f9f
updates: bz#1193929
Signed-off-by: Yaniv Kaul <ykaul@redhat.com>
---
 rpc/rpc-transport/socket/src/socket.c | 5 -----
 rpc/rpc-transport/socket/src/socket.h | 5 -----
 2 files changed, 10 deletions(-)

(limited to 'rpc/rpc-transport')

diff --git a/rpc/rpc-transport/socket/src/socket.c b/rpc/rpc-transport/socket/src/socket.c
index 48f6116c458..4af8022f71d 100644
--- a/rpc/rpc-transport/socket/src/socket.c
+++ b/rpc/rpc-transport/socket/src/socket.c
@@ -12,20 +12,15 @@
 #include "name.h"
 #include <glusterfs/dict.h>
 #include "rpc-transport.h"
-#include <glusterfs/logging.h>
-#include <glusterfs/xlator.h>
 #include <glusterfs/syscall.h>
 #include <glusterfs/byte-order.h>
-#include <glusterfs/common-utils.h>
 #include <glusterfs/compat-errno.h>
 #include "socket-mem-types.h"
-#include <glusterfs/timer.h>
 
 /* ugly #includes below */
 #include "protocol-common.h"
 #include "glusterfs3-xdr.h"
 #include "glusterfs4-xdr.h"
-#include "xdr-nfs3.h"
 #include "rpcsvc.h"
 
 /* for TCP_USER_TIMEOUT */
diff --git a/rpc/rpc-transport/socket/src/socket.h b/rpc/rpc-transport/socket/src/socket.h
index e7c00909192..44a727cc4a1 100644
--- a/rpc/rpc-transport/socket/src/socket.h
+++ b/rpc/rpc-transport/socket/src/socket.h
@@ -22,12 +22,7 @@
 #include <openssl/ecdh.h>
 #endif
 
-#include <glusterfs/gf-event.h>
 #include "rpc-transport.h"
-#include <glusterfs/logging.h>
-#include <glusterfs/dict.h>
-#include <glusterfs/mem-pool.h>
-#include <glusterfs/globals.h>
 #include <glusterfs/refcount.h>
 
 #ifndef MAX_IOVEC
-- 
cgit