LU-14868 llite: revert 'simplify callback handling for async getattr'

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

diff --git a/lustre/include/obd.h b/lustre/include/obd.h
index 10f728c..e4daa4c 100644 (file)
--- a/lustre/include/obd.h
+++ b/lustre/include/obd.h
@@ -949,27 +949,20 @@ struct md_callback {
                               void *data, int flag);
 };
 
-struct md_op_item;
-typedef int (*md_op_item_cb_t)(struct req_capsule *pill,
-                              struct md_op_item *item,
-                              int rc);
-
-enum md_opcode {
-       MD_OP_NONE      = 0,
-       MD_OP_GETATTR   = 1,
-       MD_OP_MAX,
-};
-
-struct md_op_item {
-       enum md_opcode                   mop_opc;
-       struct md_op_data                mop_data;
-       struct lookup_intent             mop_it;
-       struct lustre_handle             mop_lockh;
-       struct ldlm_enqueue_info         mop_einfo;
-       md_op_item_cb_t                  mop_cb;
-       void                            *mop_cbdata;
-       struct inode                    *mop_dir;
-       __u64                            mop_lock_flags;
+struct md_enqueue_info;
+/* metadata stat-ahead */
+typedef int (* md_enqueue_cb_t)(struct ptlrpc_request *req,
+                                struct md_enqueue_info *minfo,
+                                int rc);
+
+struct md_enqueue_info {
+       struct md_op_data               mi_data;
+       struct lookup_intent            mi_it;
+       struct lustre_handle            mi_lockh;
+       struct inode                   *mi_dir;
+       struct ldlm_enqueue_info        mi_einfo;
+       md_enqueue_cb_t                 mi_cb;
+       void                           *mi_cbdata;
 };
 
 struct obd_ops {
@@ -1167,7 +1160,7 @@ struct md_ops {
                          u64, const char *, size_t, struct ptlrpc_request **);
 
        int (*m_intent_getattr_async)(struct obd_export *,
-                                     struct md_op_item *);
+                                     struct md_enqueue_info *);
 
         int (*m_revalidate_lock)(struct obd_export *, struct lookup_intent *,
                                  struct lu_fid *, __u64 *bits);