diff options
Diffstat (limited to 'drivers/staging/lustre/lustre/include/obd_support.h')
| -rw-r--r-- | drivers/staging/lustre/lustre/include/obd_support.h | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/drivers/staging/lustre/lustre/include/obd_support.h b/drivers/staging/lustre/lustre/include/obd_support.h index 92c89925ff67..2991d2ee780b 100644 --- a/drivers/staging/lustre/lustre/include/obd_support.h +++ b/drivers/staging/lustre/lustre/include/obd_support.h @@ -37,10 +37,10 @@ #ifndef _OBD_SUPPORT #define _OBD_SUPPORT +#include <linux/slab.h> #include "../../include/linux/libcfs/libcfs.h" -#include "lvfs.h" +#include "linux/lustre_compat25.h" #include "lprocfs_status.h" -#include "linux/obd_support.h" /* global variables */ extern struct lprocfs_stats *obd_memory; @@ -127,12 +127,12 @@ int obd_alloc_fail(const void *ptr, const char *name, const char *type, /* Max connect interval for nonresponsive servers; ~50s to avoid building up connect requests in the LND queues, but within obd_timeout so we don't miss the recovery window */ -#define CONNECTION_SWITCH_MAX min(50U, max(CONNECTION_SWITCH_MIN,obd_timeout)) +#define CONNECTION_SWITCH_MAX min(50U, max(CONNECTION_SWITCH_MIN, obd_timeout)) #define CONNECTION_SWITCH_INC 5 /* Connection timeout backoff */ /* In general this should be low to have quick detection of a system running on a backup server. (If it's too low, import_select_connection will increase the timeout anyhow.) */ -#define INITIAL_CONNECT_TIMEOUT max(CONNECTION_SWITCH_MIN,obd_timeout/20) +#define INITIAL_CONNECT_TIMEOUT max(CONNECTION_SWITCH_MIN, obd_timeout/20) /* The max delay between connects is SWITCH_MAX + SWITCH_INC + INITIAL */ #define RECONNECT_DELAY_MAX (CONNECTION_SWITCH_MAX + CONNECTION_SWITCH_INC + \ INITIAL_CONNECT_TIMEOUT) @@ -402,6 +402,7 @@ int obd_alloc_fail(const void *ptr, const char *name, const char *type, #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 @@ -667,7 +668,7 @@ do { \ } else { \ OBD_ALLOC_POST(ptr, size, "vmalloced"); \ } \ -} while(0) +} while (0) # define OBD_VMALLOC(ptr, size) \ __OBD_VMALLOC_VEROBSE(ptr, NULL, 0, size) @@ -729,7 +730,7 @@ do { \ OBD_FREE_PRE(ptr, size, "kfreed"); \ kfree(ptr); \ POISON_PTR(ptr); \ -} while(0) +} while (0) #define OBD_FREE_RCU(ptr, size, handle) \ @@ -741,7 +742,7 @@ do { \ __h->h_size = (size); \ call_rcu(&__h->h_rcu, class_handle_free_cb); \ POISON_PTR(ptr); \ -} while(0) +} while (0) #define OBD_VFREE(ptr, size) \ @@ -775,7 +776,7 @@ do { \ OBD_SLAB_FREE_RTN0(ptr, slab)))) { \ OBD_ALLOC_POST(ptr, size, "slab-alloced"); \ } \ -} while(0) +} while (0) #define OBD_SLAB_ALLOC_GFP(ptr, slab, size, flags) \ __OBD_SLAB_ALLOC_VERBOSE(ptr, slab, NULL, 0, size, flags) @@ -789,7 +790,7 @@ do { \ OBD_FREE_PRE(ptr, size, "slab-freed"); \ kmem_cache_free(slab, ptr); \ POISON_PTR(ptr); \ -} while(0) +} while (0) #define OBD_SLAB_ALLOC(ptr, slab, size) \ OBD_SLAB_ALLOC_GFP(ptr, slab, size, GFP_NOFS) |