From 21c437621ba2edc0b35adc06f587b691f0fa2df0 Mon Sep 17 00:00:00 2001 From: Ian Ziemba Date: Wed, 22 Feb 2023 16:00:43 -0600 Subject: [PATCH] LU-16991 kfilnd: Init LNet NI data in dev alloc LNet ni_nid was being set outside of kfilnd_dev_alloc(). This was causing the incorrect debugfs directories to be generated inside kfilnd_dev_alloc(). Fix this by setting all LNet NI fields inside kfilnd_dev_alloc(). Test-Parameters: trivial HPE-bug-id: LUS-11496 Signed-off-by: Ian Ziemba Change-Id: I4eecfa05966cb7793a01b92b0bc49ffca252976e Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/51783 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Ron Gredvig Reviewed-by: Oleg Drokin --- lnet/klnds/kfilnd/kfilnd.c | 3 --- lnet/klnds/kfilnd/kfilnd_dev.c | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lnet/klnds/kfilnd/kfilnd.c b/lnet/klnds/kfilnd/kfilnd.c index 1145de4..5854057 100644 --- a/lnet/klnds/kfilnd/kfilnd.c +++ b/lnet/klnds/kfilnd/kfilnd.c @@ -456,9 +456,6 @@ static int kfilnd_startup(struct lnet_ni *ni) goto err; } - ni->ni_data = kfdev; - ni->ni_nid.nid_addr[0] = cpu_to_be32(LNET_NIDADDR(kfdev->nic_addr)); - /* Post a series of immediate receive buffers */ rc = kfilnd_dev_post_imm_buffers(kfdev); if (rc) { diff --git a/lnet/klnds/kfilnd/kfilnd_dev.c b/lnet/klnds/kfilnd/kfilnd_dev.c index 5113551..a1a3059 100644 --- a/lnet/klnds/kfilnd/kfilnd_dev.c +++ b/lnet/klnds/kfilnd/kfilnd_dev.c @@ -251,6 +251,9 @@ struct kfilnd_dev *kfilnd_dev_alloc(struct lnet_ni *ni, /* Mark that the dev/NI has now been initialized */ dev->kfd_state = KFILND_STATE_INITIALIZED; + ni->ni_data = dev; + ni->ni_nid.nid_addr[0] = cpu_to_be32(LNET_NIDADDR(dev->nic_addr)); + /* Initialize debugfs stats. */ dev->dev_dir = debugfs_create_dir(libcfs_nidstr(&ni->ni_nid), kfilnd_debug_dir); -- 1.8.3.1