diff options
| author | James Simmons <jsimmons@infradead.org> | 2016-02-22 17:29:22 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-02-22 18:05:49 -0800 |
| commit | 83c991b29b43b3b5883ede3c6646d1f56be67994 (patch) | |
| tree | a261c933e82e93b700b912c294a8dc7cd3d9cf32 /drivers/staging/lustre/include | |
| parent | 0cf56a1a9926b5e78c6dce246960fda625df744c (diff) | |
| download | op-kernel-dev-83c991b29b43b3b5883ede3c6646d1f56be67994.zip op-kernel-dev-83c991b29b43b3b5883ede3c6646d1f56be67994.tar.gz | |
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: James Simmons <jsimmons@infradead.org>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-6763
Reviewed-on: http://review.whamcloud.com/15386
Reviewed-by: Chris Horn <hornc@cray.com>
Reviewed-by: Amir Shehata <amir.shehata@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/lustre/include')
| -rw-r--r-- | drivers/staging/lustre/include/linux/lnet/lib-types.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/staging/lustre/include/linux/lnet/lib-types.h b/drivers/staging/lustre/include/linux/lnet/lib-types.h index f588e06..c10f03b 100644 --- a/drivers/staging/lustre/include/linux/lnet/lib-types.h +++ b/drivers/staging/lustre/include/linux/lnet/lib-types.h @@ -38,7 +38,6 @@ #include <linux/kthread.h> #include <linux/uio.h> #include <linux/types.h> -#include <net/sock.h> #include "types.h" |
