[lustre-devel] [PATCH 11/24] lnet: change ni_status in lnet_ni to u32*
James Simmons
jsimmons at infradead.org
Mon Sep 5 18:55:24 PDT 2022
From: Mr NeilBrown <neilb at suse.de>
struct lnet_ni.ni_status points to a 'struct lnet_ni_status', but only
the ns_status field of that structure is ever accessed.
Change ni_status to point directly to just the ns_status field.
This will provide flexibility for introducing a variant for 'struct
lnet_ni_status' which holds a large-address nid.
WC-bug-id: https://jira.whamcloud.com/browse/LU-10391
Lustre-commit: 9e2df7e5cc5fca3c6 ("LU-10391 lnet: change ni_status in lnet_ni to u32*")
Signed-off-by: Mr NeilBrown <neilb at suse.de>
Reviewed-on: https://review.whamcloud.com/44626
Reviewed-by: James Simmons <jsimmons at infradead.org>
Reviewed-by: Chris Horn <chris.horn at hpe.com>
Reviewed-by: Serguei Smirnov <ssmirnov at whamcloud.com>
Reviewed-by: Oleg Drokin <green at whamcloud.com>
Signed-off-by: James Simmons <jsimmons at infradead.org>
---
include/linux/lnet/lib-lnet.h | 8 ++++----
include/linux/lnet/lib-types.h | 2 +-
net/lnet/lnet/api-ni.c | 2 +-
net/lnet/lnet/router.c | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/include/linux/lnet/lib-lnet.h b/include/linux/lnet/lib-lnet.h
index 57c8dc2..2900c05 100644
--- a/include/linux/lnet/lib-lnet.h
+++ b/include/linux/lnet/lib-lnet.h
@@ -108,11 +108,11 @@
{
bool update = false;
- if (ni->ni_status && ni->ni_status->ns_status != status) {
+ if (ni->ni_status && *ni->ni_status != status) {
CDEBUG(D_NET, "ni %s status changed from %#x to %#x\n",
libcfs_nidstr(&ni->ni_nid),
- ni->ni_status->ns_status, status);
- ni->ni_status->ns_status = status;
+ *ni->ni_status, status);
+ *ni->ni_status = status;
update = true;
}
@@ -128,7 +128,7 @@
else if (atomic_read(&ni->ni_fatal_error_on))
return LNET_NI_STATUS_DOWN;
else if (ni->ni_status)
- return ni->ni_status->ns_status;
+ return *ni->ni_status;
else
return LNET_NI_STATUS_UP;
}
diff --git a/include/linux/lnet/lib-types.h b/include/linux/lnet/lib-types.h
index 09b9d8e..2266d1b 100644
--- a/include/linux/lnet/lib-types.h
+++ b/include/linux/lnet/lib-types.h
@@ -500,7 +500,7 @@ struct lnet_ni {
struct lnet_net *ni_net;
/* my health status */
- struct lnet_ni_status *ni_status;
+ u32 *ni_status;
/* NI FSM. Protected by lnet_ni_lock() */
enum lnet_ni_state ni_state;
diff --git a/net/lnet/lnet/api-ni.c b/net/lnet/lnet/api-ni.c
index 7c94d16..0449136 100644
--- a/net/lnet/lnet/api-ni.c
+++ b/net/lnet/lnet/api-ni.c
@@ -1967,7 +1967,7 @@ struct lnet_ping_buffer *
lnet_ni_lock(ni);
ns->ns_status = lnet_ni_get_status_locked(ni);
- ni->ni_status = ns;
+ ni->ni_status = &ns->ns_status;
lnet_ni_unlock(ni);
i++;
diff --git a/net/lnet/lnet/router.c b/net/lnet/lnet/router.c
index b684243..98707e9 100644
--- a/net/lnet/lnet/router.c
+++ b/net/lnet/lnet/router.c
@@ -1082,7 +1082,7 @@ int lnet_get_rtr_pool_cfg(int cpt, struct lnet_ioctl_pool_cfg *pool_cfg)
*/
if (atomic_read(&ni->ni_fatal_error_on) &&
ni->ni_status &&
- ni->ni_status->ns_status != LNET_NI_STATUS_DOWN &&
+ *ni->ni_status != LNET_NI_STATUS_DOWN &&
lnet_ni_set_status(ni, LNET_NI_STATUS_DOWN))
push = true;
}
--
1.8.3.1
More information about the lustre-devel
mailing list