From: Mr NeilBrown Date: Thu, 7 Nov 2019 04:10:16 +0000 (+1100) Subject: LU-9679 lnet: discard lnet_ping_buffer_numref() X-Git-Tag: 2.13.53~250 X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=c2c45b21c3549355a9b3ecb7d1639415fe3131df LU-9679 lnet: discard lnet_ping_buffer_numref() This inline function simply reads an atomic_t. Having it doesn't make the code any more readable and would make a subsequent patch a little more awkward. So remove it. Signed-off-by: Mr NeilBrown Change-Id: I21a1d2187a654f139a02c0045601086fe612e5bd Reviewed-on: https://review.whamcloud.com/37458 Tested-by: jenkins Tested-by: Maloo Reviewed-by: James Simmons Reviewed-by: Shaun Tancheff Reviewed-by: Oleg Drokin --- diff --git a/lnet/include/lnet/lib-lnet.h b/lnet/include/lnet/lib-lnet.h index f0c551e..2f984cc 100644 --- a/lnet/include/lnet/lib-lnet.h +++ b/lnet/include/lnet/lib-lnet.h @@ -882,11 +882,6 @@ static inline void lnet_ping_buffer_decref(struct lnet_ping_buffer *pbuf) lnet_ping_buffer_free(pbuf); } -static inline int lnet_ping_buffer_numref(struct lnet_ping_buffer *pbuf) -{ - return atomic_read(&pbuf->pb_refcnt); -} - static inline int lnet_push_target_resize_needed(void) { return the_lnet.ln_push_target->pb_nnis < the_lnet.ln_push_target_nnis; diff --git a/lnet/lnet/api-ni.c b/lnet/lnet/api-ni.c index b644b05..f09bc5f 100644 --- a/lnet/lnet/api-ni.c +++ b/lnet/lnet/api-ni.c @@ -1513,7 +1513,7 @@ lnet_ping_buffer_alloc(int nnis, gfp_t gfp) void lnet_ping_buffer_free(struct lnet_ping_buffer *pbuf) { - LASSERT(lnet_ping_buffer_numref(pbuf) == 0); + LASSERT(atomic_read(&pbuf->pb_refcnt) == 0); LIBCFS_FREE(pbuf, LNET_PING_BUFFER_SIZE(pbuf->pb_nnis)); } @@ -1726,7 +1726,7 @@ lnet_ping_target_setup(struct lnet_ping_buffer **ppbuf, fail_unlink_ping_me: LNetMEUnlink(me); fail_decref_ping_buffer: - LASSERT(lnet_ping_buffer_numref(*ppbuf) == 1); + LASSERT(atomic_read(&(*ppbuf)->pb_refcnt) == 1); lnet_ping_buffer_decref(*ppbuf); *ppbuf = NULL; fail_free_eq: @@ -1747,7 +1747,7 @@ lnet_ping_md_unlink(struct lnet_ping_buffer *pbuf, LNetInvalidateMDHandle(ping_mdh); /* NB the MD could be busy; this just starts the unlink */ - while (lnet_ping_buffer_numref(pbuf) > 1) { + while (atomic_read(&pbuf->pb_refcnt) > 1) { CDEBUG(D_NET, "Still waiting for ping data MD to unlink\n"); set_current_state(TASK_UNINTERRUPTIBLE); schedule_timeout(cfs_time_seconds(1)); @@ -1981,7 +1981,7 @@ static void lnet_push_target_fini(void) LNetInvalidateMDHandle(&the_lnet.ln_push_target_md); /* Wait for the unlink to complete. */ - while (lnet_ping_buffer_numref(the_lnet.ln_push_target) > 1) { + while (atomic_read(&the_lnet.ln_push_target->pb_refcnt) > 1) { CDEBUG(D_NET, "Still waiting for ping data MD to unlink\n"); set_current_state(TASK_UNINTERRUPTIBLE); schedule_timeout(cfs_time_seconds(1));