extern unsigned int at_history;
extern int at_early_margin;
extern int at_extra;
-extern unsigned int obd_sync_filter;
extern unsigned int obd_max_dirty_pages;
-extern atomic_t obd_unstable_pages;
extern atomic_t obd_dirty_pages;
extern atomic_t obd_dirty_transit_pages;
extern unsigned int obd_alloc_fail_rate;
#define OBD_FAIL_MDS_RENAME 0x153
#define OBD_FAIL_MDS_RENAME2 0x154
#define OBD_FAIL_MDS_RENAME3 0x155
+#define OBD_FAIL_MDS_RENAME4 0x156
/* layout lock */
#define OBD_FAIL_MDS_NO_LL_GETATTR 0x170
#define OBD_FAIL_LDLM_AGL_NOLOCK 0x31b
#define OBD_FAIL_LDLM_OST_LVB 0x31c
#define OBD_FAIL_LDLM_ENQUEUE_HANG 0x31d
+#define OBD_FAIL_LDLM_PAUSE_CANCEL2 0x31f
#define OBD_FAIL_LDLM_CP_CB_WAIT2 0x320
#define OBD_FAIL_LDLM_CP_CB_WAIT3 0x321
#define OBD_FAIL_LDLM_CP_CB_WAIT4 0x322
#define OBD_FAIL_TGT_LAST_REPLAY 0x710
#define OBD_FAIL_TGT_CLIENT_ADD 0x711
#define OBD_FAIL_TGT_RCVG_FLAG 0x712
+#define OBD_FAIL_TGT_DELAY_CONDITIONAL 0x713
#define OBD_FAIL_MDC_REVALIDATE_PAUSE 0x800
#define OBD_FAIL_MDC_ENQUEUE_PAUSE 0x801
#define OBD_FAIL_LFSCK_NOPFID 0x1617
#define OBD_FAIL_LFSCK_CHANGE_STRIPE 0x1618
#define OBD_FAIL_LFSCK_INVALID_PFID 0x1619
+#define OBD_FAIL_LFSCK_LOST_SPEOBJ 0x161a
+#define OBD_FAIL_LFSCK_DELAY5 0x161b
#define OBD_FAIL_LFSCK_NOTIFY_NET 0x16f0
#define OBD_FAIL_LFSCK_QUERY_NET 0x16f1
#define OBD_FAIL_MIGRATE_ENTRIES 0x1801
#define OBD_FAIL_MIGRATE_LINKEA 0x1802
+/* LMV */
+#define OBD_FAIL_UNKNOWN_LMV_STRIPE 0x1901
+
+/* DT */
+#define OBD_FAIL_DT_DECLARE_ATTR_GET 0x2000
+#define OBD_FAIL_DT_ATTR_GET 0x2001
+#define OBD_FAIL_DT_DECLARE_ATTR_SET 0x2002
+#define OBD_FAIL_DT_ATTR_SET 0x2003
+#define OBD_FAIL_DT_DECLARE_XATTR_GET 0x2004
+#define OBD_FAIL_DT_XATTR_GET 0x2005
+#define OBD_FAIL_DT_DECLARE_XATTR_SET 0x2006
+#define OBD_FAIL_DT_XATTR_SET 0x2007
+#define OBD_FAIL_DT_DECLARE_XATTR_DEL 0x2008
+#define OBD_FAIL_DT_XATTR_DEL 0x2009
+#define OBD_FAIL_DT_XATTR_LIST 0x200a
+#define OBD_FAIL_DT_DECLARE_CREATE 0x200b
+#define OBD_FAIL_DT_CREATE 0x200c
+#define OBD_FAIL_DT_DECLARE_DESTROY 0x200d
+#define OBD_FAIL_DT_DESTROY 0x200e
+#define OBD_FAIL_DT_INDEX_TRY 0x200f
+#define OBD_FAIL_DT_DECLARE_REF_ADD 0x2010
+#define OBD_FAIL_DT_REF_ADD 0x2011
+#define OBD_FAIL_DT_DECLARE_REF_DEL 0x2012
+#define OBD_FAIL_DT_REF_DEL 0x2013
+#define OBD_FAIL_DT_DECLARE_INSERT 0x2014
+#define OBD_FAIL_DT_INSERT 0x2015
+#define OBD_FAIL_DT_DECLARE_DELETE 0x2016
+#define OBD_FAIL_DT_DELETE 0x2017
+#define OBD_FAIL_DT_LOOKUP 0x2018
+
/* Assign references to moved code to reduce code changes */
#define OBD_FAIL_PRECHECK(id) CFS_FAIL_PRECHECK(id)
#define OBD_FAIL_CHECK(id) CFS_FAIL_CHECK(id)
#define OBD_CPT_ALLOC_PTR(ptr, cptab, cpt) \
OBD_CPT_ALLOC(ptr, cptab, cpt, sizeof *(ptr))
-# define __OBD_VMALLOC_VEROBSE(ptr, cptab, cpt, size) \
+/* Direct use of __vmalloc() allows for protection flag specification
+ * (and particularly to not set __GFP_FS, which is likely to cause some
+ * deadlock situations in our code).
+ */
+# define __OBD_VMALLOC_VERBOSE(ptr, cptab, cpt, size) \
do { \
(ptr) = cptab == NULL ? \
- vmalloc(size) : \
- cfs_cpt_vmalloc(cptab, cpt, size); \
+ __vmalloc(size, GFP_NOFS | __GFP_HIGHMEM | __GFP_ZERO, \
+ PAGE_KERNEL) : \
+ cfs_cpt_vzalloc(cptab, cpt, size); \
if (unlikely((ptr) == NULL)) { \
CERROR("vmalloc of '" #ptr "' (%d bytes) failed\n", \
(int)(size)); \
CERROR(LPU64" total bytes allocated by Lustre, %d by LNET\n", \
obd_memory_sum(), atomic_read(&libcfs_kmemory)); \
} else { \
- memset(ptr, 0, size); \
OBD_ALLOC_POST(ptr, size, "vmalloced"); \
} \
} while(0)
# define OBD_VMALLOC(ptr, size) \
- __OBD_VMALLOC_VEROBSE(ptr, NULL, 0, size)
+ __OBD_VMALLOC_VERBOSE(ptr, NULL, 0, size)
# define OBD_CPT_VMALLOC(ptr, cptab, cpt, size) \
- __OBD_VMALLOC_VEROBSE(ptr, cptab, cpt, size)
+ __OBD_VMALLOC_VERBOSE(ptr, cptab, cpt, size)
#ifdef __KERNEL__