LU-224 Move fail_loc handling from lustre to libcfs

[fs/lustre-release.git] / lustre / lvfs / lvfs_lib.c

diff --git a/lustre/lvfs/lvfs_lib.c b/lustre/lvfs/lvfs_lib.c
index 7bfe92d..9660b90 100644 (file)
--- a/lustre/lvfs/lvfs_lib.c
+++ b/lustre/lvfs/lvfs_lib.c
@@ -47,8 +47,6 @@
 #include <lustre_lib.h>
 #include <lprocfs_status.h>
 
-unsigned int obd_fail_val = 0;
-unsigned long obd_fail_loc = 0;
 unsigned int obd_alloc_fail_rate = 0;
 
 int obd_alloc_fail(const void *ptr, const char *name, const char *type,
@@ -72,91 +70,6 @@ int obd_alloc_fail(const void *ptr, const char *name, const char *type,
 }
 EXPORT_SYMBOL(obd_alloc_fail);
 
-int __obd_fail_check_set(__u32 id, __u32 value, int set)
-{
-        static cfs_atomic_t obd_fail_count = CFS_ATOMIC_INIT(0);
-
-        LASSERT(!(id & OBD_FAIL_ONCE));
-
-        if ((obd_fail_loc & (OBD_FAILED | OBD_FAIL_ONCE)) ==
-            (OBD_FAILED | OBD_FAIL_ONCE)) {
-                cfs_atomic_set(&obd_fail_count, 0); /* paranoia */
-                return 0;
-        }
-
-        /* Fail 1/obd_fail_val times */
-        if (obd_fail_loc & OBD_FAIL_RAND) {
-                if (obd_fail_val < 2 || cfs_rand() % obd_fail_val > 0)
-                        return 0;
-        }
-
-        /* Skip the first obd_fail_val, then fail */
-        if (obd_fail_loc & OBD_FAIL_SKIP) {
-                if (cfs_atomic_inc_return(&obd_fail_count) <= obd_fail_val)
-                        return 0;
-        }
-
-        /* Fail obd_fail_val times, overridden by FAIL_ONCE */
-        if (obd_fail_loc & OBD_FAIL_SOME &&
-            (!(obd_fail_loc & OBD_FAIL_ONCE) || obd_fail_val <= 1)) {
-                int count = cfs_atomic_inc_return(&obd_fail_count);
-
-                if (count >= obd_fail_val) {
-                        cfs_set_bit(OBD_FAIL_ONCE_BIT, &obd_fail_loc);
-                        cfs_atomic_set(&obd_fail_count, 0);
-                        /* we are lost race to increase obd_fail_count */
-                        if (count > obd_fail_val)
-                                return 0;
-                }
-        }
-
-        if ((set == OBD_FAIL_LOC_ORSET || set == OBD_FAIL_LOC_RESET) &&
-            (value & OBD_FAIL_ONCE))
-                cfs_set_bit(OBD_FAIL_ONCE_BIT, &obd_fail_loc);
-
-        /* Lost race to set OBD_FAILED_BIT. */
-        if (cfs_test_and_set_bit(OBD_FAILED_BIT, &obd_fail_loc)) {
-                /* If OBD_FAIL_ONCE is valid, only one process can fail,
-                 * otherwise multi-process can fail at the same time. */
-                if (obd_fail_loc & OBD_FAIL_ONCE)
-                        return 0;
-        }
-
-        switch (set) {
-                case OBD_FAIL_LOC_NOSET:
-                        break;
-                case OBD_FAIL_LOC_ORSET:
-                        obd_fail_loc |= value & ~(OBD_FAILED | OBD_FAIL_ONCE);
-                        break;
-                case OBD_FAIL_LOC_RESET:
-                        obd_fail_loc = value;
-                        break;
-                default:
-                        LASSERTF(0, "called with bad set %u\n", set);
-                        break;
-        }
-
-        return 1;
-}
-EXPORT_SYMBOL(__obd_fail_check_set);
-
-int __obd_fail_timeout_set(__u32 id, __u32 value, int ms, int set)
-{
-        int ret = 0;
-
-        ret = __obd_fail_check_set(id, value, set);
-        if (ret) {
-                CERROR("obd_fail_timeout id %x sleeping for %dms\n",
-                       id, ms);
-                cfs_schedule_timeout_and_set_state(CFS_TASK_UNINT,
-                                                   cfs_time_seconds(ms) / 1000);
-                cfs_set_current_state(CFS_TASK_RUNNING);
-                CERROR("obd_fail_timeout id %x awake\n", id);
-        }
-        return ret;
-}
-EXPORT_SYMBOL(__obd_fail_timeout_set);
-
 #ifdef LPROCFS
 void lprocfs_counter_add(struct lprocfs_stats *stats, int idx,
                                        long amount)
@@ -231,6 +144,4 @@ void lprocfs_counter_sub(struct lprocfs_stats *stats, int idx,
 EXPORT_SYMBOL(lprocfs_counter_sub);
 #endif  /* LPROCFS */
 
-EXPORT_SYMBOL(obd_fail_loc);
 EXPORT_SYMBOL(obd_alloc_fail_rate);
-EXPORT_SYMBOL(obd_fail_val);