Whamcloud - gitweb
LU-18609 ldlm: use of logical '&&' with constant operand 13/57613/3
authorBobi Jam <bobijam@whamcloud.com>
Thu, 2 Jan 2025 10:31:57 +0000 (18:31 +0800)
committerOleg Drokin <green@whamcloud.com>
Sun, 2 Feb 2025 06:20:28 +0000 (06:20 +0000)
CoverityID: 454269 (CONSTANT_EXPRESSION_RESULT)
Transform bitwise operator result into a boolean value for boolean
operation.

Fixes: 5517eab06e ("LU-1876 hsm: layout lock implementation on server side")
Fixes: 70b9dc57a9 ("LU-17812 ldlm: stack trace log for LDLM error")
Signed-off-by: Bobi Jam <bobijam@whamcloud.com>
Change-Id: I6a6c22a0d1178da99a5253cb03020b5cc2372a31
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/57613
Tested-by: Maloo <maloo@whamcloud.com>
Tested-by: jenkins <devops@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Timothy Day <timday@amazon.com>
lustre/include/lustre_dlm.h

index a8dcc1a..c736dae 100644 (file)
@@ -1176,13 +1176,13 @@ static inline int ldlm_is_granted(struct ldlm_lock *lock)
 static inline bool ldlm_has_layout(struct ldlm_lock *lock)
 {
        return lock->l_resource->lr_type == LDLM_IBITS &&
-               lock->l_policy_data.l_inodebits.bits & MDS_INODELOCK_LAYOUT;
+               !!(lock->l_policy_data.l_inodebits.bits & MDS_INODELOCK_LAYOUT);
 }
 
 static inline bool ldlm_has_dom(struct ldlm_lock *lock)
 {
        return lock->l_resource->lr_type == LDLM_IBITS &&
-               lock->l_policy_data.l_inodebits.bits & MDS_INODELOCK_DOM;
+               !!(lock->l_policy_data.l_inodebits.bits & MDS_INODELOCK_DOM);
 }
 
 static inline char *
@@ -1351,7 +1351,7 @@ extern const char *ldlm_it2str(enum ldlm_intent_flags it);
                _ldlm_lock_debug(lock, msgdata, fmt, ##a);              \
                if (unlikely(ldlm_lock_to_ns(lock)->                    \
                                ns_dump_stack_on_error) &&              \
-                                               (mask) & D_ERROR)       \
+                                               !!((mask) & D_ERROR))   \
                        dump_stack();                                   \
        }                                                               \
 } while (0)