From 0af247b17619f586702b0ad37f0796bdf783b11c Mon Sep 17 00:00:00 2001 From: Nikitas Angelinas Date: Mon, 10 Dec 2018 20:49:52 -0800 Subject: [PATCH] LU-11755 ldlm: remove LASSERT() in ns_is_{client,server}() (ns->ns_client == LDLM_NAMESPACE_CLIENT || ns->ns_client == LDLM_NAMESPACE_SERVER) implies that (!(ns->ns_client & ~(LDLM_NAMESPACE_CLIENT |LDLM_NAMESPACE_SERVER))) is also true, so the latter LASSERT() can be removed from ns_is_{client,server}(). Signed-off-by: Nikitas Angelinas Cray-bug-id: LUS-6762 Change-Id: Ib165d97ca397d5109c046415d2ec513357b07cbd Reviewed-on: https://review.whamcloud.com/33822 Reviewed-by: Andreas Dilger Tested-by: Jenkins Reviewed-by: Alexandr Boyko Tested-by: Maloo --- lustre/include/lustre_dlm.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lustre/include/lustre_dlm.h b/lustre/include/lustre_dlm.h index c5660da..9e6ca24 100644 --- a/lustre/include/lustre_dlm.h +++ b/lustre/include/lustre_dlm.h @@ -541,8 +541,6 @@ struct ldlm_namespace { static inline int ns_is_client(struct ldlm_namespace *ns) { LASSERT(ns != NULL); - LASSERT(!(ns->ns_client & ~(LDLM_NAMESPACE_CLIENT | - LDLM_NAMESPACE_SERVER))); LASSERT(ns->ns_client == LDLM_NAMESPACE_CLIENT || ns->ns_client == LDLM_NAMESPACE_SERVER); return ns->ns_client == LDLM_NAMESPACE_CLIENT; @@ -554,8 +552,6 @@ static inline int ns_is_client(struct ldlm_namespace *ns) static inline int ns_is_server(struct ldlm_namespace *ns) { LASSERT(ns != NULL); - LASSERT(!(ns->ns_client & ~(LDLM_NAMESPACE_CLIENT | - LDLM_NAMESPACE_SERVER))); LASSERT(ns->ns_client == LDLM_NAMESPACE_CLIENT || ns->ns_client == LDLM_NAMESPACE_SERVER); return ns->ns_client == LDLM_NAMESPACE_SERVER; -- 1.8.3.1