LU-13090 utils: fix lfs_migrate -p for file with pool

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

diff --git a/libcfs/libcfs/fail.c b/libcfs/libcfs/fail.c
index 13d31ab..304faae 100644 (file)
--- a/libcfs/libcfs/fail.c
+++ b/libcfs/libcfs/fail.c
@@ -29,6 +29,7 @@
  * Lustre is a trademark of Oracle Corporation, Inc.
  */
 
+#include <linux/random.h>
 #include <libcfs/libcfs.h>
 
 unsigned long cfs_fail_loc = 0;
@@ -57,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;
        }
 
@@ -129,7 +130,7 @@ int __cfs_fail_timeout_set(__u32 id, __u32 value, int ms, int set)
                CERROR("cfs_fail_timeout id %x sleeping for %dms\n", id, ms);
                while (ktime_before(ktime_get(), till)) {
                        set_current_state(TASK_UNINTERRUPTIBLE);
-                       schedule_timeout(msecs_to_jiffies(1000) / 10);
+                       schedule_timeout(cfs_time_seconds(1) / 10);
                        set_current_state(TASK_RUNNING);
                        if (!cfs_fail_loc) {
                                CERROR("cfs_fail_timeout interrupted\n");