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
LU-5710 all: second batch of corrected typos and grammar errors
[fs/lustre-release.git]
/
lustre
/
include
/
lustre_import.h
diff --git
a/lustre/include/lustre_import.h
b/lustre/include/lustre_import.h
index
f4a7b90
..
8ae6648
100644
(file)
--- a/
lustre/include/lustre_import.h
+++ b/
lustre/include/lustre_import.h
@@
-27,7
+27,7
@@
* Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
* Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2011, 201
3
, Intel Corporation.
+ * Copyright (c) 2011, 201
4
, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
*/
/*
* This file is part of Lustre, http://www.lustre.org/
@@
-70,6
+70,11
@@
struct adaptive_timeout {
spinlock_t at_lock;
};
spinlock_t at_lock;
};
+enum lustre_at_flags {
+ LATF_SKIP = 0x0,
+ LATF_STATS = 0x1,
+};
+
struct ptlrpc_at_array {
struct list_head *paa_reqs_array; /** array to hold requests */
__u32 paa_size; /** the size of array */
struct ptlrpc_at_array {
struct list_head *paa_reqs_array; /** array to hold requests */
__u32 paa_size; /** the size of array */
@@
-218,6
+223,8
@@
struct obd_import {
atomic_t imp_timeouts;
/** Current import state */
enum lustre_imp_state imp_state;
atomic_t imp_timeouts;
/** Current import state */
enum lustre_imp_state imp_state;
+ /** Last replay state */
+ enum lustre_imp_state imp_replay_state;
/** History of import states */
struct import_state_hist imp_state_hist[IMP_STATE_HIST_LEN];
int imp_state_hist_idx;
/** History of import states */
struct import_state_hist imp_state_hist[IMP_STATE_HIST_LEN];
int imp_state_hist_idx;
@@
-248,7
+255,7
@@
struct obd_import {
struct lustre_handle imp_remote_handle;
/** When to perform next ping. time in jiffies. */
cfs_time_t imp_next_ping;
struct lustre_handle imp_remote_handle;
/** When to perform next ping. time in jiffies. */
cfs_time_t imp_next_ping;
-
/** When we last succe
sfully connected. time in 64bit jiffies */
+
/** When we last succes
sfully connected. time in 64bit jiffies */
__u64 imp_last_success_conn;
/** List of all possible connection for import. */
__u64 imp_last_success_conn;
/** List of all possible connection for import. */