Commit 83c991b2 authored by James Simmons's avatar James Simmons Committed by Greg Kroah-Hartman

staging: lustre: use sock.h in only acceptor.c

On some platforms having sock.h in lib-types.h would collide with
other included header files being used in the LNet layer. Looking
at what was needed from sock.h only acceptor.c is dependent on it.
To avoid these issues we just use sock.h only in acceptor.c.
Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-6763
Reviewed-on: http://review.whamcloud.com/15386Reviewed-by: default avatarChris Horn <hornc@cray.com>
Reviewed-by: default avatarAmir Shehata <amir.shehata@intel.com>
Reviewed-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0cf56a1a
...@@ -38,7 +38,6 @@ ...@@ -38,7 +38,6 @@
#include <linux/kthread.h> #include <linux/kthread.h>
#include <linux/uio.h> #include <linux/uio.h>
#include <linux/types.h> #include <linux/types.h>
#include <net/sock.h>
#include "types.h" #include "types.h"
......
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
#define DEBUG_SUBSYSTEM S_LNET #define DEBUG_SUBSYSTEM S_LNET
#include <linux/completion.h> #include <linux/completion.h>
#include <net/sock.h>
#include "../../include/linux/lnet/lib-lnet.h" #include "../../include/linux/lnet/lib-lnet.h"
static int accept_port = 988; static int accept_port = 988;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment