LU-2675 lustre: move lustre_intent.h to lustre/include

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

diff --git a/lustre/include/obd_target.h b/lustre/include/obd_target.h
index 0d7ea23..330d44f 100644 (file)
--- a/lustre/include/obd_target.h
+++ b/lustre/include/obd_target.h
@@ -48,19 +48,16 @@ struct obd_device_target {
        struct obd_job_stats    obt_jobstats;
 };
 
-#define FILTER_SUBDIR_COUNT 32 /* set to zero for no subdirs */
+#define OBJ_SUBDIR_COUNT 32 /* set to zero for no subdirs */
 
 struct filter_obd {
        /* NB this field MUST be first */
-       struct obd_device_target        fo_obt;
-       rwlock_t                        fo_sptlrpc_lock;
-       struct sptlrpc_rule_set         fo_sptlrpc_rset;
+       struct obd_device_target         fo_obt;
 
        /* capability related */
-       unsigned int                    fo_fl_oss_capa;
-       cfs_list_t                      fo_capa_keys;
-       cfs_hlist_head_t               *fo_capa_hash;
-       int                             fo_sec_level;
+       unsigned int                     fo_fl_oss_capa;
+       struct list_head                 fo_capa_keys;
+       struct hlist_head               *fo_capa_hash;
 };
 
 struct echo_obd {
@@ -69,15 +66,16 @@ struct echo_obd {
        spinlock_t                      eo_lock;
        __u64                           eo_lastino;
        struct lustre_handle            eo_nl_lock;
-       cfs_atomic_t                    eo_prep;
+       atomic_t                        eo_prep;
 };
 
 struct ost_obd {
-       struct ptlrpc_service          *ost_service;
-       struct ptlrpc_service          *ost_create_service;
-       struct ptlrpc_service          *ost_io_service;
-       struct ptlrpc_service          *ost_seq_service;
-       struct mutex                    ost_health_mutex;
+       struct ptlrpc_service   *ost_service;
+       struct ptlrpc_service   *ost_create_service;
+       struct ptlrpc_service   *ost_io_service;
+       struct ptlrpc_service   *ost_seq_service;
+       struct ptlrpc_service   *ost_out_service;
+       struct mutex             ost_health_mutex;
 };
 
 #endif /* __OBD_TARGET_H */