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 f55aa5b..e671e69 100644 (file)
--- a/lustre/include/obd.h
+++ b/lustre/include/obd.h
@@ -498,7 +498,6 @@ struct mgs_obd {
         struct vfsmount                 *mgs_vfsmnt;
         struct super_block              *mgs_sb;
         struct dentry                   *mgs_configs_dir;
-        struct dentry                   *mgs_fid_de;
         cfs_list_t                       mgs_fs_db_list;
         cfs_semaphore_t                  mgs_sem;
         cfs_proc_dir_entry_t            *mgs_proc_live;
@@ -510,7 +509,6 @@ struct mds_obd {
         struct ptlrpc_service           *mds_service;
         struct ptlrpc_service           *mds_setattr_service;
         struct ptlrpc_service           *mds_readpage_service;
-        cfs_dentry_t                    *mds_fid_de;
         int                              mds_max_mdsize;
         int                              mds_max_cookiesize;
         __u64                            mds_io_epoch;
@@ -864,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;
 }
@@ -878,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;
 }
@@ -906,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 */
@@ -985,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 */
@@ -1164,6 +1171,18 @@ enum obd_cleanup_stage {
 
 struct lu_context;
 
+/* /!\ must be coherent with include/linux/namei.h on patched kernel */
+#define IT_OPEN     (1 << 0)
+#define IT_CREAT    (1 << 1)
+#define IT_READDIR  (1 << 2)
+#define IT_GETATTR  (1 << 3)
+#define IT_LOOKUP   (1 << 4)
+#define IT_UNLINK   (1 << 5)
+#define IT_TRUNC    (1 << 6)
+#define IT_GETXATTR (1 << 7)
+#define IT_EXEC     (1 << 8)
+#define IT_PIN      (1 << 9)
+
 static inline int it_to_lock_mode(struct lookup_intent *it)
 {
         /* CREAT needs to be tested before open (both could be set) */
@@ -1325,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);