Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Branch HEAD
[fs/lustre-release.git]
/
lustre
/
include
/
obd_support.h
diff --git
a/lustre/include/obd_support.h
b/lustre/include/obd_support.h
index
5d7a407
..
6765019
100644
(file)
--- a/
lustre/include/obd_support.h
+++ b/
lustre/include/obd_support.h
@@
-23,7
+23,7
@@
#ifndef _OBD_SUPPORT
#define _OBD_SUPPORT
#ifndef _OBD_SUPPORT
#define _OBD_SUPPORT
-#include <libcfs/
kp30
.h>
+#include <libcfs/
libcfs
.h>
#include <lvfs.h>
#include <lprocfs_status.h>
#include <lvfs.h>
#include <lprocfs_status.h>
@@
-70,6
+70,10
@@
extern unsigned int obd_alloc_fail_rate;
int __obd_fail_check_set(__u32 id, __u32 value, int set);
int __obd_fail_check_set(__u32 id, __u32 value, int set);
+/* lvfs.c */
+int obd_alloc_fail(const void *ptr, const char *name, const char *type,
+ size_t size, const char *file, int line);
+
/* Timeout definitions */
#define LDLM_TIMEOUT_DEFAULT 20
#define OBD_TIMEOUT_DEFAULT 100
/* Timeout definitions */
#define LDLM_TIMEOUT_DEFAULT 20
#define OBD_TIMEOUT_DEFAULT 100
@@
-200,8
+204,8
@@
int __obd_fail_check_set(__u32 id, __u32 value, int set);
#define OBD_FAIL_LDLM_CANCEL_EVICT_RACE 0x311
/*
#define OBD_FAIL_LDLM_PAUSE_CANCEL 0x312
#define OBD_FAIL_LDLM_CANCEL_EVICT_RACE 0x311
/*
#define OBD_FAIL_LDLM_PAUSE_CANCEL 0x312
-#define OBD_FAIL_LDLM_CLOSE_THREAD 0x313
*/
*/
+#define OBD_FAIL_LDLM_CLOSE_THREAD 0x313
#define OBD_FAIL_LDLM_CANCEL_BL_CB_RACE 0x314
#define OBD_FAIL_OSC 0x400
#define OBD_FAIL_LDLM_CANCEL_BL_CB_RACE 0x314
#define OBD_FAIL_OSC 0x400
@@
-217,6
+221,7
@@
int __obd_fail_check_set(__u32 id, __u32 value, int set);
#define OBD_FAIL_OSC_BRW_PREP_REQ2 0x40a
#define OBD_FAIL_OSC_CONNECT_CKSUM 0x40b
#define OBD_FAIL_OSC_CKSUM_ADLER_ONLY 0x40c
#define OBD_FAIL_OSC_BRW_PREP_REQ2 0x40a
#define OBD_FAIL_OSC_CONNECT_CKSUM 0x40b
#define OBD_FAIL_OSC_CKSUM_ADLER_ONLY 0x40c
+#define OBD_FAIL_OSC_DIO_PAUSE 0x40d
#define OBD_FAIL_PTLRPC 0x500
#define OBD_FAIL_PTLRPC_ACK 0x501
#define OBD_FAIL_PTLRPC 0x500
#define OBD_FAIL_PTLRPC_ACK 0x501
@@
-239,9
+244,11
@@
int __obd_fail_check_set(__u32 id, __u32 value, int set);
#define OBD_FAIL_TGT_DELAY_CONNECT 0x703
#define OBD_FAIL_TGT_DELAY_RECONNECT 0x704
#define OBD_FAIL_TGT_DELAY_PRECREATE 0x705
#define OBD_FAIL_TGT_DELAY_CONNECT 0x703
#define OBD_FAIL_TGT_DELAY_RECONNECT 0x704
#define OBD_FAIL_TGT_DELAY_PRECREATE 0x705
+#define OBD_FAIL_TGT_TOOMANY_THREADS 0x706
#define OBD_FAIL_MDC_REVALIDATE_PAUSE 0x800
#define OBD_FAIL_MDC_ENQUEUE_PAUSE 0x801
#define OBD_FAIL_MDC_REVALIDATE_PAUSE 0x800
#define OBD_FAIL_MDC_ENQUEUE_PAUSE 0x801
+#define OBD_FAIL_MDC_GETATTR_ENQUEUE 0x803
#define OBD_FAIL_MGS 0x900
#define OBD_FAIL_MGS_ALL_REQUEST_NET 0x901
#define OBD_FAIL_MGS 0x900
#define OBD_FAIL_MGS_ALL_REQUEST_NET 0x901
@@
-750,7
+757,8
@@
do { \
#define OBD_SLAB_FREE_PTR(ptr, slab) \
OBD_SLAB_FREE((ptr), (slab), sizeof *(ptr))
#define OBD_SLAB_FREE_PTR(ptr, slab) \
OBD_SLAB_FREE((ptr), (slab), sizeof *(ptr))
-#define KEY_IS(str) (keylen >= strlen(str) && strncmp(key, str, keylen) == 0)
+#define KEY_IS(str) \
+ (keylen >= (sizeof(str)-1) && memcmp(key, str, (sizeof(str)-1)) == 0)
/* Wrapper for contiguous page frame allocation */
#define OBD_PAGES_ALLOC(ptr, order, gfp_mask) \
/* Wrapper for contiguous page frame allocation */
#define OBD_PAGES_ALLOC(ptr, order, gfp_mask) \