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
land lustre part of b_hd_sec on HEAD.
[fs/lustre-release.git]
/
lustre
/
include
/
linux
/
lustre_import.h
diff --git
a/lustre/include/linux/lustre_import.h
b/lustre/include/linux/lustre_import.h
index
e7230d0
..
d3c182c
100644
(file)
--- a/
lustre/include/linux/lustre_import.h
+++ b/
lustre/include/linux/lustre_import.h
@@
-46,6
+46,8
@@
enum obd_import_event {
IMP_EVENT_ACTIVE = 0x808004,
};
IMP_EVENT_ACTIVE = 0x808004,
};
+struct ptlrpc_sec;
+
struct obd_import_conn {
struct list_head oic_item;
struct ptlrpc_connection *oic_conn;
struct obd_import_conn {
struct list_head oic_item;
struct ptlrpc_connection *oic_conn;
@@
-53,7
+55,6
@@
struct obd_import_conn {
unsigned long oic_last_attempt; /* in jiffies */
};
unsigned long oic_last_attempt; /* in jiffies */
};
-
struct obd_import {
struct portals_handle imp_handle;
atomic_t imp_refcount;
struct obd_import {
struct portals_handle imp_handle;
atomic_t imp_refcount;
@@
-70,7
+71,11
@@
struct obd_import {
struct list_head imp_sending_list;
struct list_head imp_delayed_list;
struct list_head imp_sending_list;
struct list_head imp_delayed_list;
+ /* list of ongoing raw rpcs (only used by gss) */
+ struct list_head imp_rawrpc_list;
+
struct obd_device *imp_obd;
struct obd_device *imp_obd;
+ struct ptlrpc_sec *imp_sec;
wait_queue_head_t imp_recovery_waitq;
__u64 imp_last_replay_transno;
atomic_t imp_inflight;
wait_queue_head_t imp_recovery_waitq;
__u64 imp_last_replay_transno;
atomic_t imp_inflight;