Whamcloud - gitweb
LU-11755 ldlm: remove LASSERT() in ns_is_{client,server}() 93/35193/2
authorNikitas Angelinas <nangelinas@cray.com>
Tue, 11 Dec 2018 04:49:52 +0000 (20:49 -0800)
committerOleg Drokin <green@whamcloud.com>
Thu, 20 Jun 2019 03:56:29 +0000 (03:56 +0000)
(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 <nangelinas@cray.com>
Cray-bug-id: LUS-6762
Change-Id: Ib165d97ca397d5109c046415d2ec513357b07cbd
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Alexandr Boyko <c17825@cray.com>
Signed-off-by: Minh Diep <mdiep@whamcloud.com>
Reviewed-on: https://review.whamcloud.com/35193
Tested-by: Jenkins
Tested-by: Maloo <maloo@whamcloud.com>
lustre/include/lustre_dlm.h

index 6293d1c..09a3966 100644 (file)
@@ -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;