These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / staging / lustre / include / linux / libcfs / libcfs_fail.h

diff --git a/kernel/drivers/staging/lustre/include/linux/libcfs/libcfs_fail.h b/kernel/drivers/staging/lustre/include/linux/libcfs/libcfs_fail.h
index eea55d9..aa69c6a 100644 (file)
--- a/kernel/drivers/staging/lustre/include/linux/libcfs/libcfs_fail.h
+++ b/kernel/drivers/staging/lustre/include/linux/libcfs/libcfs_fail.h
@@ -79,14 +79,16 @@ static inline int cfs_fail_check_set(__u32 id, __u32 value,
 {
        int ret = 0;
 
-       if (unlikely(CFS_FAIL_PRECHECK(id) &&
-                    (ret = __cfs_fail_check_set(id, value, set)))) {
-               if (quiet) {
-                       CDEBUG(D_INFO, "*** cfs_fail_loc=%x, val=%u***\n",
-                              id, value);
-               } else {
-                       LCONSOLE_INFO("*** cfs_fail_loc=%x, val=%u***\n",
-                                     id, value);
+       if (unlikely(CFS_FAIL_PRECHECK(id))) {
+               ret = __cfs_fail_check_set(id, value, set);
+               if (ret) {
+                       if (quiet) {
+                               CDEBUG(D_INFO, "*** cfs_fail_loc=%x, val=%u***\n",
+                                      id, value);
+                       } else {
+                               LCONSOLE_INFO("*** cfs_fail_loc=%x, val=%u***\n",
+                                             id, value);
+                       }
                }
        }