Land b1_2 onto HEAD (20040304_171022)

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

diff --git a/lustre/include/linux/lustre_export.h b/lustre/include/linux/lustre_export.h
index 218807c..9be781f 100644 (file)
--- a/lustre/include/linux/lustre_export.h
+++ b/lustre/include/linux/lustre_export.h
@@ -26,7 +26,7 @@ struct mds_export_data {
 struct osc_creator {
         spinlock_t              oscc_lock;
         struct list_head        oscc_list;
-        struct obd_export      *oscc_exp;
+        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
         int                     oscc_initial_create_count;
@@ -38,10 +38,6 @@ struct osc_creator {
         wait_queue_head_t       oscc_waitq; /* creating procs wait on this */
 };
 
-struct osc_export_data {
-        struct osc_creator      oed_oscc;
-};
-
 struct ldlm_export_data {
         struct list_head       led_held_locks; /* protected by namespace lock */
 };
@@ -83,14 +79,12 @@ struct obd_export {
                 struct mds_export_data    eu_mds_data;
                 struct filter_export_data eu_filter_data;
                 struct ec_export_data     eu_ec_data;
-                struct osc_export_data    eu_osc_data;
         } u;
 };
 
 #define exp_mds_data    u.eu_mds_data
 #define exp_lov_data    u.eu_lov_data
 #define exp_filter_data u.eu_filter_data
-#define exp_osc_data    u.eu_osc_data
 #define exp_ec_data     u.eu_ec_data
 
 extern struct obd_export *class_conn2export(struct lustre_handle *conn);