Commit f8499d6e authored by Chengguang Xu's avatar Chengguang Xu Committed by Greg Kroah-Hartman

staging: erofs: code cleanup for erofs_kmalloc()

Define a dummy function of time_to_inject()/erofs_show_injection_info(),
so that we don't have to check macro CONFIG_EROFS_FAULT_INJECTION in
calling place.
Signed-off-by: default avatarChengguang Xu <cgxu519@gmx.com>
Reviewed-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7dc07434
...@@ -42,12 +42,12 @@ ...@@ -42,12 +42,12 @@
#define DBG_BUGON(...) ((void)0) #define DBG_BUGON(...) ((void)0)
#endif #endif
#ifdef CONFIG_EROFS_FAULT_INJECTION
enum { enum {
FAULT_KMALLOC, FAULT_KMALLOC,
FAULT_MAX, FAULT_MAX,
}; };
#ifdef CONFIG_EROFS_FAULT_INJECTION
extern char *erofs_fault_name[FAULT_MAX]; extern char *erofs_fault_name[FAULT_MAX];
#define IS_FAULT_SET(fi, type) ((fi)->inject_type & (1 << (type))) #define IS_FAULT_SET(fi, type) ((fi)->inject_type & (1 << (type)))
...@@ -143,17 +143,24 @@ static inline bool time_to_inject(struct erofs_sb_info *sbi, int type) ...@@ -143,17 +143,24 @@ static inline bool time_to_inject(struct erofs_sb_info *sbi, int type)
} }
return false; return false;
} }
#else
static inline bool time_to_inject(struct erofs_sb_info *sbi, int type)
{
return false;
}
static inline void erofs_show_injection_info(int type)
{
}
#endif #endif
static inline void *erofs_kmalloc(struct erofs_sb_info *sbi, static inline void *erofs_kmalloc(struct erofs_sb_info *sbi,
size_t size, gfp_t flags) size_t size, gfp_t flags)
{ {
#ifdef CONFIG_EROFS_FAULT_INJECTION
if (time_to_inject(sbi, FAULT_KMALLOC)) { if (time_to_inject(sbi, FAULT_KMALLOC)) {
erofs_show_injection_info(FAULT_KMALLOC); erofs_show_injection_info(FAULT_KMALLOC);
return NULL; return NULL;
} }
#endif
return kmalloc(size, flags); return kmalloc(size, flags);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment