From: Nikitas Angelinas Date: Tue, 11 Dec 2018 04:49:52 +0000 (-0800) Subject: LU-11755 ldlm: remove LASSERT() in ns_is_{client,server}() X-Git-Tag: 2.12.3-RC1~173 X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=refs%2Fchanges%2F93%2F35193%2F2;p=fs%2Flustre-release.git 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}(). Lustre-change: https://review.whamcloud.com/33822 Lustre-commit: 0af247b17619f586702b0ad37f0796bdf783b11c Test-Parameters: trivial Signed-off-by: Nikitas Angelinas Cray-bug-id: LUS-6762 Change-Id: Ib165d97ca397d5109c046415d2ec513357b07cbd Reviewed-by: Andreas Dilger Reviewed-by: Alexandr Boyko Signed-off-by: Minh Diep Reviewed-on: https://review.whamcloud.com/35193 Tested-by: Jenkins Tested-by: Maloo --- diff --git a/lustre/include/lustre_dlm.h b/lustre/include/lustre_dlm.h index 6293d1c..09a3966 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;