b=17873

[fs/lustre-release.git] / lustre / include / lustre_export.h

diff --git a/lustre/include/lustre_export.h b/lustre/include/lustre_export.h
index ef3cd4c..72a83af 100644 (file)
--- a/lustre/include/lustre_export.h
+++ b/lustre/include/lustre_export.h
@@ -37,9 +37,9 @@
 #ifndef __EXPORT_H
 #define __EXPORT_H
 
+#include <lprocfs_status.h>
 #include <lustre/lustre_idl.h>
 #include <lustre_dlm.h>
-#include <lprocfs_status.h>
 #include <class_hash.h>
 
 struct mds_client_data;
@@ -74,7 +74,7 @@ struct mdt_export_data {
 
 struct osc_creator {
         spinlock_t              oscc_lock;
-        struct list_head        oscc_list;
+        struct list_head        oscc_wait_create_list;
         struct obd_device       *oscc_obd;
         obd_id                  oscc_last_id;//last available pre-created object
         obd_id                  oscc_next_id;// what object id to give out next
@@ -143,7 +143,17 @@ enum obd_option {
 struct obd_export {
         struct portals_handle     exp_handle;
         atomic_t                  exp_refcount;
-        atomic_t                  exp_rpc_count;
+        /**
+         * Set of counters below is to track where export references are
+         * kept. The exp_rpc_count is used for reconnect handling also,
+         * the cb_count and locks_count are for debug purposes only for now.
+         * The sum of them should be less than exp_refcount by 3
+         */
+        atomic_t                  exp_rpc_count; /** RPC references */
+        atomic_t                  exp_cb_count; /** Commit callback references */
+        atomic_t                  exp_locks_count; /** Lock references */
+
+        atomic_t                  exp_replay_count;
         struct obd_uuid           exp_client_uuid;
         struct list_head          exp_obd_chain;
         struct hlist_node         exp_uuid_hash; /* uuid-export hash*/
@@ -245,6 +255,12 @@ static inline int exp_connect_vbr(struct obd_export *exp)
         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;