diff options
| author | Oleg Drokin <green@linuxhacker.ru> | 2015-09-16 12:27:05 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-09-16 20:32:13 -0700 |
| commit | 543d5f3d280748558e6f187e1805a16164d59dac (patch) | |
| tree | ab0511642354ce29c31907e437e8132d383c1f02 /drivers/staging/lustre/lustre/include/obd_support.h | |
| parent | e1708ad71433b01ed38fa5468bc0e8e95fc267fb (diff) | |
| download | linux-0-day-543d5f3d280748558e6f187e1805a16164d59dac.tar.gz linux-0-day-543d5f3d280748558e6f187e1805a16164d59dac.tar.xz | |
staging/lustre: Remove memory allocation fault injection framework
Lustre memory allocation wrappers also included a fault injection
framework that's totally redundant, since in-kernel offering is
actually superior to what we had.
So let's remove it.
Signed-off-by: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/lustre/lustre/include/obd_support.h')
| -rw-r--r-- | drivers/staging/lustre/lustre/include/obd_support.h | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/drivers/staging/lustre/lustre/include/obd_support.h b/drivers/staging/lustre/lustre/include/obd_support.h index 8a3323c2dc203..3d92f19c0017a 100644 --- a/drivers/staging/lustre/lustre/include/obd_support.h +++ b/drivers/staging/lustre/lustre/include/obd_support.h @@ -66,13 +66,8 @@ extern unsigned int obd_sync_filter; extern unsigned int obd_max_dirty_pages; extern atomic_t obd_dirty_pages; extern atomic_t obd_dirty_transit_pages; -extern unsigned int obd_alloc_fail_rate; extern char obd_jobid_var[]; -/* lvfs.c */ -int obd_alloc_fail(const void *ptr, const char *name, const char *type, - size_t size, const char *file, int line); - /* Some hash init argument constants */ #define HASH_POOLS_BKT_BITS 3 #define HASH_POOLS_CUR_BITS 3 @@ -428,8 +423,6 @@ int obd_alloc_fail(const void *ptr, const char *name, const char *type, #define OBD_FAIL_LPROC_REMOVE 0xB00 -#define OBD_FAIL_GENERAL_ALLOC 0xC00 - #define OBD_FAIL_SEQ 0x1000 #define OBD_FAIL_SEQ_QUERY_NET 0x1001 #define OBD_FAIL_SEQ_EXHAUST 0x1002 @@ -545,12 +538,6 @@ __u64 obd_pages_max(void); #endif /* !OBD_DEBUG_MEMUSAGE */ -#define HAS_FAIL_ALLOC_FLAG OBD_FAIL_CHECK(OBD_FAIL_GENERAL_ALLOC) - -#define OBD_ALLOC_FAIL_BITS 24 -#define OBD_ALLOC_FAIL_MASK ((1 << OBD_ALLOC_FAIL_BITS) - 1) -#define OBD_ALLOC_FAIL_MULT (OBD_ALLOC_FAIL_MASK / 100) - #ifdef CONFIG_DEBUG_SLAB #define POISON(ptr, c, s) do {} while (0) #define POISON_PTR(ptr) ((void)0) @@ -596,13 +583,8 @@ do { \ kmem_cache_alloc(slab, type | __GFP_ZERO) : \ kmem_cache_alloc_node(slab, type | __GFP_ZERO, \ cfs_cpt_spread_node(cptab, cpt)); \ - if (likely((ptr) != NULL && \ - (!HAS_FAIL_ALLOC_FLAG || obd_alloc_fail_rate == 0 || \ - !obd_alloc_fail(ptr, #ptr, "slab-", size, \ - __FILE__, __LINE__) || \ - OBD_SLAB_FREE_RTN0(ptr, slab)))) { \ + if (likely(ptr)) \ OBD_ALLOC_POST(ptr, size, "slab-alloced"); \ - } \ } while (0) #define OBD_SLAB_ALLOC_GFP(ptr, slab, size, flags) \ |