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
b=17670
[fs/lustre-release.git]
/
lustre
/
include
/
lustre_export.h
diff --git
a/lustre/include/lustre_export.h
b/lustre/include/lustre_export.h
index
d0e502d
..
f284bab
100644
(file)
--- a/
lustre/include/lustre_export.h
+++ b/
lustre/include/lustre_export.h
@@
-37,9
+37,9
@@
#ifndef __EXPORT_H
#define __EXPORT_H
#ifndef __EXPORT_H
#define __EXPORT_H
+#include <lprocfs_status.h>
#include <lustre/lustre_idl.h>
#include <lustre_dlm.h>
#include <lustre/lustre_idl.h>
#include <lustre_dlm.h>
-#include <lprocfs_status.h>
#include <class_hash.h>
struct mds_client_data;
#include <class_hash.h>
struct mds_client_data;
@@
-181,7
+181,10
@@
struct obd_export {
exp_need_sync:1,
exp_flvr_changed:1,
exp_flvr_adapt:1,
exp_need_sync:1,
exp_flvr_changed:1,
exp_flvr_adapt:1,
- exp_libclient:1; /* liblustre client? */
+ exp_libclient:1, /* liblustre client? */
+ /* client timed out and tried to reconnect,
+ * but couldn't because of active rpcs */
+ exp_abort_active_req:1;
struct list_head exp_queued_rpc; /* RPC to be handled */
/* also protected by exp_lock */
enum lustre_sec_part exp_sp_peer;
struct list_head exp_queued_rpc; /* RPC to be handled */
/* also protected by exp_lock */
enum lustre_sec_part exp_sp_peer;
@@
-242,6
+245,12
@@
static inline int exp_connect_vbr(struct obd_export *exp)
return !!(exp->exp_connect_flags & OBD_CONNECT_VBR);
}
return !!(exp->exp_connect_flags & OBD_CONNECT_VBR);
}
+static inline int exp_connect_som(struct obd_export *exp)
+{
+ LASSERT(exp != NULL);
+ return !!(exp->exp_connect_flags & OBD_CONNECT_SOM);
+}
+
static inline int imp_connect_lru_resize(struct obd_import *imp)
{
struct obd_connect_data *ocd;
static inline int imp_connect_lru_resize(struct obd_import *imp)
{
struct obd_connect_data *ocd;