LU-12930 various: use schedule_timeout_*interruptible

[fs/lustre-release.git] / libcfs / libcfs / fail.c

diff --git a/libcfs/libcfs/fail.c b/libcfs/libcfs/fail.c
index 509c3c2..0478f4a 100644 (file)
--- a/libcfs/libcfs/fail.c
+++ b/libcfs/libcfs/fail.c
@@ -16,36 +16,31 @@
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see http://www.gnu.org/licenses
  *
- * Please contact Oracle Corporation, Inc., 500 Oracle Parkway, Redwood Shores,
- * CA 94065 USA or visit www.oracle.com if you need additional information or
- * have any questions.
- *
  * GPL HEADER END
  */
 /*
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, Intel Corporation.
+ * Copyright (c) 2012, 2015, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  * Lustre is a trademark of Oracle Corporation, Inc.
  */
 
-#ifndef __KERNEL__
-#include <liblustre.h>
-#else
+#include <linux/random.h>
 #include <libcfs/libcfs.h>
-#endif
 
 unsigned long cfs_fail_loc = 0;
 unsigned int cfs_fail_val = 0;
-wait_queue_head_t cfs_race_waitq;
+int cfs_fail_err;
+DECLARE_WAIT_QUEUE_HEAD(cfs_race_waitq);
 int cfs_race_state;
 
 EXPORT_SYMBOL(cfs_fail_loc);
 EXPORT_SYMBOL(cfs_fail_val);
+EXPORT_SYMBOL(cfs_fail_err);
 EXPORT_SYMBOL(cfs_race_waitq);
 EXPORT_SYMBOL(cfs_race_state);
 
@@ -63,7 +58,7 @@ int __cfs_fail_check_set(__u32 id, __u32 value, int set)
 
        /* Fail 1/cfs_fail_val times */
        if (cfs_fail_loc & CFS_FAIL_RAND) {
-               if (cfs_fail_val < 2 || cfs_rand() % cfs_fail_val > 0)
+               if (cfs_fail_val < 2 || prandom_u32_max(cfs_fail_val) > 0)
                        return 0;
        }
 
@@ -93,8 +88,9 @@ int __cfs_fail_check_set(__u32 id, __u32 value, int set)
                }
        }
 
-       if ((set == CFS_FAIL_LOC_ORSET || set == CFS_FAIL_LOC_RESET) &&
-           (value & CFS_FAIL_ONCE))
+       /* Take into account the current call for FAIL_ONCE for ORSET only,
+        * as RESET is a new fail_loc, it does not change the current call */
+       if ((set == CFS_FAIL_LOC_ORSET) && (value & CFS_FAIL_ONCE))
                set_bit(CFS_FAIL_ONCE_BIT, &cfs_fail_loc);
        /* Lost race to set CFS_FAILED_BIT. */
        if (test_and_set_bit(CFS_FAILED_BIT, &cfs_fail_loc)) {
@@ -113,6 +109,7 @@ int __cfs_fail_check_set(__u32 id, __u32 value, int set)
                        break;
                case CFS_FAIL_LOC_RESET:
                        cfs_fail_loc = value;
+                       atomic_set(&cfs_fail_count, 0);
                        break;
                default:
                        LASSERTF(0, "called with bad set %u\n", set);
@@ -125,16 +122,23 @@ EXPORT_SYMBOL(__cfs_fail_check_set);
 
 int __cfs_fail_timeout_set(__u32 id, __u32 value, int ms, int set)
 {
+       ktime_t till = ktime_add_ms(ktime_get(), ms);
        int ret = 0;
 
        ret = __cfs_fail_check_set(id, value, set);
-       if (ret) {
-               CERROR("cfs_fail_timeout id %x sleeping for %dms\n",
-                      id, ms);
-               schedule_timeout_and_set_state(TASK_UNINTERRUPTIBLE,
-                                                  cfs_time_seconds(ms) / 1000);
-               set_current_state(TASK_RUNNING);
-               CERROR("cfs_fail_timeout id %x awake\n", id);
+       if (ret && likely(ms > 0)) {
+               CERROR("cfs_fail_timeout id %x sleeping for %dms\n", id, ms);
+               while (ktime_before(ktime_get(), till)) {
+                       schedule_timeout_uninterruptible(cfs_time_seconds(1)
+                                                        / 10);
+                       set_current_state(TASK_RUNNING);
+                       if (!cfs_fail_loc) {
+                               CERROR("cfs_fail_timeout interrupted\n");
+                               break;
+                       }
+               }
+               if (cfs_fail_loc)
+                       CERROR("cfs_fail_timeout id %x awake\n", id);
        }
        return ret;
 }