* GPL HEADER END
*/
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*/
/*
extern int at_extra;
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 cfs_atomic_t obd_dirty_pages;
+extern cfs_atomic_t obd_dirty_transit_pages;
extern cfs_waitq_t obd_race_waitq;
extern int obd_race_state;
extern unsigned int obd_alloc_fail_rate;
#define OBD_TIMEOUT_DEFAULT 100
#define LDLM_TIMEOUT_DEFAULT 20
#define MDS_LDLM_TIMEOUT_DEFAULT 6
-/* Time to wait for all clients to reconnect during recovery */
+/* Time to wait for all clients to reconnect during recovery (hard limit) */
+#define OBD_RECOVERY_TIME_HARD (obd_timeout * 9)
+/* Time to wait for all clients to reconnect during recovery (soft limit) */
/* Should be very conservative; must catch the first reconnect after reboot */
-#define OBD_RECOVERY_FACTOR (3) /* times obd_timeout */
+#define OBD_RECOVERY_TIME_SOFT (obd_timeout * 3)
/* Change recovery-small 26b time if you change this */
#define PING_INTERVAL max(obd_timeout / 4, 1U)
+/* a bit more than maximal journal commit time in seconds */
+#define PING_INTERVAL_SHORT min(PING_INTERVAL, 7U)
/* Client may skip 1 ping; we must wait at least 2.5. But for multiple
* failover targets the client only pings one server at a time, and pings
* can be lost on a loaded network. Since eviction has serious consequences,
#define OBD_FAIL_MDS_FAIL_LOV_LOG_ADD 0x140
#define OBD_FAIL_MDS_LOV_PREP_CREATE 0x141
#define OBD_FAIL_MDS_REINT_DELAY 0x142
-#define OBD_FAIL_MDS_OPEN_WAIT_CREATE 0x143
-#define OBD_FAIL_MDS_READLINK_EPROTO 0x144
+#define OBD_FAIL_MDS_READLINK_EPROTO 0x143
+#define OBD_FAIL_MDS_OPEN_WAIT_CREATE 0x144
+#define OBD_FAIL_MDS_PDO_LOCK 0x145
+#define OBD_FAIL_MDS_PDO_LOCK2 0x146
+#define OBD_FAIL_MDS_OSC_CREATE_FAIL 0x147
/* CMD */
#define OBD_FAIL_MDS_IS_SUBDIR_NET 0x180
#define OBD_FAIL_OST_BRW_PAUSE_PACK 0x224
#define OBD_FAIL_OST_CONNECT_NET2 0x225
#define OBD_FAIL_OST_NOMEM 0x226
+#define OBD_FAIL_OST_BRW_PAUSE_BULK2 0x227
#define OBD_FAIL_LDLM 0x300
#define OBD_FAIL_LDLM_NAMESPACE_NEW 0x301
#define OBD_FAIL_OSC_DIO_PAUSE 0x40d
#define OBD_FAIL_OSC_OBJECT_CONTENTION 0x40e
#define OBD_FAIL_OSC_CP_CANCEL_RACE 0x40f
+#define OBD_FAIL_OSC_CP_ENQ_RACE 0x410
#define OBD_FAIL_PTLRPC 0x500
#define OBD_FAIL_PTLRPC_ACK 0x501
#define OBD_FAIL_TGT_FAKE_EXP 0x708
#define OBD_FAIL_TGT_REPLAY_DELAY 0x709
#define OBD_FAIL_TGT_LAST_REPLAY 0x710
+#define OBD_FAIL_TGT_CLIENT_ADD 0x711
#define OBD_FAIL_MDC_REVALIDATE_PAUSE 0x800
#define OBD_FAIL_MDC_ENQUEUE_PAUSE 0x801
#define OBD_FAIL_QUOTA_RET_QDATA 0xA02
#define OBD_FAIL_QUOTA_DELAY_REL 0xA03
+#define OBD_FAIL_QUOTA_DELAY_SD 0xA04
#define OBD_FAIL_LPROC_REMOVE 0xB00
#define OBD_FAIL_LLOG_ORIGIN_HANDLE_WRITE_REC_NET 0x1307
#define OBD_FAIL_LLOG_ORIGIN_HANDLE_CLOSE_NET 0x1308
#define OBD_FAIL_LLOG_CATINFO_NET 0x1309
-
+#define OBD_FAIL_MDS_SYNC_CAPA_SL 0x1310
+#define OBD_FAIL_SEQ_ALLOC 0x1311
/* Failure injection control */
#define OBD_FAIL_MASK_SYS 0x0000FF00
} else {
CERROR("obd_fail_race id %x waking\n", id);
obd_race_state = 1;
- wake_up(&obd_race_waitq);
+ cfs_waitq_signal(&obd_race_waitq);
}
}
}
#define fixme() CDEBUG(D_OTHER, "FIXME\n");
-extern atomic_t libcfs_kmemory;
+extern cfs_atomic_t libcfs_kmemory;
#ifdef LPROCFS
#define obd_memory_add(size) \
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)); \
+ obd_memory_sum(), cfs_atomic_read(&libcfs_kmemory)); \
} else { \
memset(ptr, 0, size); \
OBD_ALLOC_POST(ptr, size, "vmalloced"); \
})
#define OBD_SLAB_ALLOC(ptr, slab, type, size) \
do { \
- LASSERT(ergo(type != CFS_ALLOC_ATOMIC, !in_interrupt())); \
+ LASSERT(ergo(type != CFS_ALLOC_ATOMIC, !cfs_in_interrupt())); \
(ptr) = cfs_mem_cache_alloc(slab, (type)); \
if (likely((ptr) != NULL && \
(!HAS_FAIL_ALLOC_FLAG || obd_alloc_fail_rate == 0 || \
(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) \
+#define OBD_PAGE_ALLOC(ptr, gfp_mask) \
do { \
- (ptr) = cfs_alloc_pages(gfp_mask, order); \
+ (ptr) = cfs_alloc_page(gfp_mask); \
if (unlikely((ptr) == NULL)) { \
CERROR("alloc_pages of '" #ptr "' %d page(s) / "LPU64" bytes "\
- "failed\n", (int)(1 << (order)), \
- (__u64)((1 << (order)) << CFS_PAGE_SHIFT)); \
+ "failed\n", (int)1, \
+ (__u64)(1 << CFS_PAGE_SHIFT)); \
CERROR(LPU64" total bytes and "LPU64" total pages " \
"("LPU64" bytes) allocated by Lustre, " \
"%d total bytes by LNET\n", \
obd_memory_sum(), \
obd_pages_sum() << CFS_PAGE_SHIFT, \
obd_pages_sum(), \
- atomic_read(&libcfs_kmemory)); \
+ cfs_atomic_read(&libcfs_kmemory)); \
} else { \
- obd_pages_add(order); \
+ obd_pages_add(0); \
CDEBUG(D_MALLOC, "alloc_pages '" #ptr "': %d page(s) / " \
LPU64" bytes at %p.\n", \
- (int)(1 << (order)), \
- (__u64)((1 << (order)) << CFS_PAGE_SHIFT), ptr); \
+ (int)1, \
+ (__u64)(1 << CFS_PAGE_SHIFT), ptr); \
} \
} while (0)
-#define OBD_PAGE_ALLOC(ptr, gfp_mask) \
- OBD_PAGES_ALLOC(ptr, 0, gfp_mask)
-
-#define OBD_PAGES_FREE(ptr, order) \
+#define OBD_PAGE_FREE(ptr) \
do { \
LASSERT(ptr); \
- obd_pages_sub(order); \
+ obd_pages_sub(0); \
CDEBUG(D_MALLOC, "free_pages '" #ptr "': %d page(s) / "LPU64" bytes " \
"at %p.\n", \
- (int)(1 << (order)), (__u64)((1 << (order)) << CFS_PAGE_SHIFT),\
+ (int)1, (__u64)(1 << CFS_PAGE_SHIFT), \
ptr); \
- __cfs_free_pages(ptr, order); \
+ cfs_free_page(ptr); \
(ptr) = (void *)0xdeadbeef; \
} while (0)
-#define OBD_PAGE_FREE(ptr) OBD_PAGES_FREE(ptr, 0)
-
#endif