LU-243 async lov_sync() operation

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

diff --git a/lustre/include/obd.h b/lustre/include/obd.h
index e04224b..e671e69 100644 (file)
--- a/lustre/include/obd.h
+++ b/lustre/include/obd.h
@@ -96,7 +96,7 @@ struct lov_oinfo {                 /* per-stripe data structure */
         cfs_list_t loi_hp_ready_item;
         cfs_list_t loi_write_item;
         cfs_list_t loi_read_item;
-        cfs_list_t loi_sync_fs_item;
+
         unsigned long loi_kms_valid:1;
         __u64 loi_kms;             /* known minimum size */
         struct ost_lvb loi_lvb;
@@ -123,7 +123,6 @@ static inline void loi_init(struct lov_oinfo *loi)
         CFS_INIT_LIST_HEAD(&loi->loi_hp_ready_item);
         CFS_INIT_LIST_HEAD(&loi->loi_write_item);
         CFS_INIT_LIST_HEAD(&loi->loi_read_item);
-        CFS_INIT_LIST_HEAD(&loi->loi_sync_fs_item);
 }
 
 struct lov_stripe_md {
@@ -160,12 +159,6 @@ struct obd_info;
 
 typedef int (*obd_enqueue_update_f)(void *cookie, int rc);
 
-struct osc_sync_fs_wait {
-        struct obd_info      *sfw_oi;
-        obd_enqueue_update_f  sfw_upcall;
-        int started;
-};
-
 /* obd info for a particular level (lov, osc). */
 struct obd_info {
         /* Lock policy. It keeps an extent which is specific for a particular
@@ -447,7 +440,6 @@ struct client_obd {
         cfs_list_t               cl_loi_hp_ready_list;
         cfs_list_t               cl_loi_write_list;
         cfs_list_t               cl_loi_read_list;
-        cfs_list_t               cl_loi_sync_fs_list;
         int                      cl_r_in_flight;
         int                      cl_w_in_flight;
         /* just a sum of the loi/lop pending numbers to be exported by /proc */
@@ -495,9 +487,7 @@ struct client_obd {
         struct lu_client_seq    *cl_seq;
 
         cfs_atomic_t             cl_resends; /* resend count */
-        struct osc_sync_fs_wait  cl_sf_wait;
 };
-
 #define obd2cli_tgt(obd) ((char *)(obd)->u.cli.cl_target_uuid.uuid)
 
 #define CL_NOT_QUOTACHECKED 1   /* client->cl_qchk_stat init value */
@@ -872,8 +862,8 @@ static inline void oti_alloc_cookies(struct obd_trans_info *oti,int num_cookies)
         if (num_cookies == 1)
                 oti->oti_logcookies = &oti->oti_onecookie;
         else
-                OBD_ALLOC(oti->oti_logcookies,
-                          num_cookies * sizeof(oti->oti_onecookie));
+                OBD_ALLOC_LARGE(oti->oti_logcookies,
+                                num_cookies * sizeof(oti->oti_onecookie));
 
         oti->oti_numcookies = num_cookies;
 }
@@ -886,8 +876,8 @@ static inline void oti_free_cookies(struct obd_trans_info *oti)
         if (oti->oti_logcookies == &oti->oti_onecookie)
                 LASSERT(oti->oti_numcookies == 1);
         else
-                OBD_FREE(oti->oti_logcookies,
-                         oti->oti_numcookies * sizeof(oti->oti_onecookie));
+                OBD_FREE_LARGE(oti->oti_logcookies,
+                               oti->oti_numcookies*sizeof(oti->oti_onecookie));
         oti->oti_logcookies = NULL;
         oti->oti_numcookies = 0;
 }
@@ -914,7 +904,10 @@ enum obd_notify_event {
         /* Configuration event */
         OBD_NOTIFY_CONFIG,
         /* Trigger quota recovery */
-        OBD_NOTIFY_QUOTA
+        OBD_NOTIFY_QUOTA,
+        /* Administratively deactivate/activate event */
+        OBD_NOTIFY_DEACTIVATE,
+        OBD_NOTIFY_ACTIVATE
 };
 
 /* bit-mask flags for config events */
@@ -993,13 +986,19 @@ struct obd_device {
         struct obd_type        *obd_type;
         __u32                   obd_magic;
 
+        int                     obd_minor;
+        cfs_hlist_node_t        obd_minor_node; /** < find by minor */
+
+        cfs_list_t              obd_list;
         /* common and UUID name of this device */
         char                    obd_name[MAX_OBD_NAME];
+        cfs_hlist_node_t        obd_name_node; /** < find by name */
+
         struct obd_uuid         obd_uuid;
+        cfs_hlist_node_t        obd_uuid_node; /** < find by uuid */
 
         struct lu_device       *obd_lu_dev;
 
-        int                     obd_minor;
         /* bitfield modification is protected by obd_dev_lock */
         unsigned long obd_attached:1,      /* finished attach */
                       obd_set_up:1,        /* finished setup */
@@ -1345,9 +1344,9 @@ struct obd_ops {
         int (*o_punch)(struct obd_export *exp, struct obd_info *oinfo,
                        struct obd_trans_info *oti,
                        struct ptlrpc_request_set *rqset);
-        int (*o_sync)(struct obd_export *exp, struct obdo *oa,
-                      struct lov_stripe_md *ea, obd_size start, obd_size end,
-                      void *capa);
+        int (*o_sync)(struct obd_export *exp, struct obd_info *oinfo,
+                      obd_size start, obd_size end,
+                      struct ptlrpc_request_set *set);
         int (*o_migrate)(struct lustre_handle *conn, struct lov_stripe_md *dst,
                          struct lov_stripe_md *src, obd_size start,
                          obd_size end, struct obd_trans_info *oti);
@@ -1426,8 +1425,6 @@ struct obd_ops {
                           char *ostname);
         void (*o_getref)(struct obd_device *obd);
         void (*o_putref)(struct obd_device *obd);
-        int (*o_sync_fs)(struct obd_export *exp, struct obd_info *oinfo,
-                         int wait);
         /*
          * NOTE: If adding ops, add another LPROCFS_OBD_OP_INIT() line
          * to lprocfs_alloc_obd_stats() in obdclass/lprocfs_status.c.