From 68c04b8fdd5dc5a7a19bc393182d3a8240a116c6 Mon Sep 17 00:00:00 2001 From: Mr NeilBrown Date: Thu, 22 Aug 2019 15:50:13 +1000 Subject: [PATCH] LU-6142 o2iblnd: remove some unused fields. Fields kib_min_reconnect_interval kib_max_reconnect_interval kib_ntx are never used or set. ibh_mr_shift is set but never used; rx_status is used (in a debug message) but never set. Remove them all. We could possibly remove ibh_mr_size too. It is only used for an error message. Test-Parameters: trivial Signed-off-by: Mr NeilBrown Change-Id: If1ff73c15f8e712be4e3d77e9572a4d4e741c75d Reviewed-on: https://review.whamcloud.com/35891 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Shaun Tancheff Reviewed-by: Andreas Dilger Reviewed-by: James Simmons Reviewed-by: Arshad Hussain Reviewed-by: Oleg Drokin --- lnet/klnds/o2iblnd/o2iblnd.c | 10 ++++------ lnet/klnds/o2iblnd/o2iblnd.h | 6 ------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/lnet/klnds/o2iblnd/o2iblnd.c b/lnet/klnds/o2iblnd/o2iblnd.c index dc84abc..b729fa5 100644 --- a/lnet/klnds/o2iblnd/o2iblnd.c +++ b/lnet/klnds/o2iblnd/o2iblnd.c @@ -570,9 +570,9 @@ kiblnd_get_conn_by_idx(struct lnet_ni *ni, int index) static void kiblnd_debug_rx(struct kib_rx *rx) { - CDEBUG(D_CONSOLE, " %p status %d msg_type %x cred %d\n", - rx, rx->rx_status, rx->rx_msg->ibm_type, - rx->rx_msg->ibm_credits); + CDEBUG(D_CONSOLE, " %p msg_type %x cred %d\n", + rx, rx->rx_msg->ibm_type, + rx->rx_msg->ibm_credits); } static void @@ -2590,9 +2590,7 @@ kiblnd_hdev_get_attr(struct kib_hca_dev *hdev) rc = -ENOSYS; } - if (rc == 0 && hdev->ibh_mr_size == ~0ULL) - hdev->ibh_mr_shift = 64; - else if (rc != 0) + if (rc != 0) rc = -EINVAL; #ifndef HAVE_IB_DEVICE_ATTRS diff --git a/lnet/klnds/o2iblnd/o2iblnd.h b/lnet/klnds/o2iblnd/o2iblnd.h index 7a20963..f37f8cc 100644 --- a/lnet/klnds/o2iblnd/o2iblnd.h +++ b/lnet/klnds/o2iblnd/o2iblnd.h @@ -88,12 +88,9 @@ struct kib_tunables { int *kib_dev_failover; /* HCA failover */ unsigned int *kib_service; /* IB service number */ - int *kib_min_reconnect_interval; /* first failed connection retry... */ - int *kib_max_reconnect_interval; /* ...exponentially increasing to this */ int *kib_cksum; /* checksum struct kib_msg? */ int *kib_timeout; /* comms timeout (seconds) */ int *kib_keepalive; /* keepalive timeout (seconds) */ - int *kib_ntx; /* # tx descs */ char **kib_default_ipif; /* default IPoIB interface */ int *kib_retry_count; int *kib_rnr_retry_count; @@ -202,7 +199,6 @@ struct kib_hca_dev { int ibh_page_shift; /* page shift of current HCA */ int ibh_page_size; /* page size of current HCA */ __u64 ibh_page_mask; /* page mask of current HCA */ - int ibh_mr_shift; /* bits shift of max MR size */ __u64 ibh_mr_size; /* size of MR */ #ifdef HAVE_IB_GET_DMA_MR struct ib_mr *ibh_mrs; /* global MR */ @@ -562,8 +558,6 @@ struct kib_rx { /* receive message */ struct kib_conn *rx_conn; /* # bytes received (-1 while posted) */ int rx_nob; - /* completion status */ - enum ib_wc_status rx_status; /* message buffer (host vaddr) */ struct kib_msg *rx_msg; /* message buffer (I/O addr) */ -- 1.8.3.1