From 525609ed58e7c743987ed6bba228da02392ca090 Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Mon, 21 May 2018 14:35:13 +1000 Subject: [PATCH] staging: lustre: move RESV_PORT definitions to lnet/lib-lnet.h These are network related on only used in lnet, so move to lib-lnet.h Signed-off-by: NeilBrown Signed-off-by: Greg Kroah-Hartman --- drivers/staging/lustre/include/linux/libcfs/libcfs.h | 4 ---- drivers/staging/lustre/include/linux/lnet/lib-lnet.h | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs.h b/drivers/staging/lustre/include/linux/libcfs/libcfs.h index c7d025cccb40b..20dfe8872d247 100644 --- a/drivers/staging/lustre/include/linux/libcfs/libcfs.h +++ b/drivers/staging/lustre/include/linux/libcfs/libcfs.h @@ -89,10 +89,6 @@ #define LIBCFS_VERSION "0.7.0" -/* need both kernel and user-land acceptor */ -#define LNET_ACCEPTOR_MIN_RESERVED_PORT 512 -#define LNET_ACCEPTOR_MAX_RESERVED_PORT 1023 - extern struct blocking_notifier_head libcfs_ioctl_list; static inline int notifier_from_ioctl_errno(int err) { diff --git a/drivers/staging/lustre/include/linux/lnet/lib-lnet.h b/drivers/staging/lustre/include/linux/lnet/lib-lnet.h index df4c72507a15c..82561e9e44eb7 100644 --- a/drivers/staging/lustre/include/linux/lnet/lib-lnet.h +++ b/drivers/staging/lustre/include/linux/lnet/lib-lnet.h @@ -68,6 +68,10 @@ extern struct lnet the_lnet; /* THE network */ /** exclusive lock */ #define LNET_LOCK_EX CFS_PERCPT_LOCK_EX +/* need both kernel and user-land acceptor */ +#define LNET_ACCEPTOR_MIN_RESERVED_PORT 512 +#define LNET_ACCEPTOR_MAX_RESERVED_PORT 1023 + static inline int lnet_is_route_alive(struct lnet_route *route) { /* gateway is down */ -- 2.30.2