LU-3544 fid: do open-by-fid by default

[fs/lustre-release.git] / lustre / mdc / mdc_internal.h

diff --git a/lustre/mdc/mdc_internal.h b/lustre/mdc/mdc_internal.h
index cc2816b..1769f3e 100644 (file)
--- a/lustre/mdc/mdc_internal.h
+++ b/lustre/mdc/mdc_internal.h
@@ -38,7 +38,6 @@
 #define _MDC_INTERNAL_H
 
 #include <lustre_mdc.h>
-#include <lustre_mds.h>
 
 #ifdef LPROCFS
 extern struct lprocfs_seq_vars lprocfs_mdc_obd_vars[];
@@ -50,8 +49,6 @@ void mdc_pack_body(struct ptlrpc_request *req, const struct lu_fid *fid,
 void mdc_pack_capa(struct ptlrpc_request *req,
                   const struct req_msg_field *field, struct obd_capa *oc);
 int mdc_pack_req(struct ptlrpc_request *req, int version, int opc);
-void mdc_is_subdir_pack(struct ptlrpc_request *req, const struct lu_fid *pfid,
-                        const struct lu_fid *cfid, int flags);
 void mdc_swap_layouts_pack(struct ptlrpc_request *req,
                           struct md_op_data *op_data);
 void mdc_readdir_pack(struct ptlrpc_request *req, __u64 pgoff, __u32 size,
@@ -72,8 +69,6 @@ void mdc_link_pack(struct ptlrpc_request *req, struct md_op_data *op_data);
 void mdc_rename_pack(struct ptlrpc_request *req, struct md_op_data *op_data,
                      const char *old, int oldlen, const char *new, int newlen);
 void mdc_close_pack(struct ptlrpc_request *req, struct md_op_data *op_data);
-int mdc_enter_request(struct client_obd *cli);
-void mdc_exit_request(struct client_obd *cli);
 
 /* mdc/mdc_locks.c */
 int mdc_set_lock_data(struct obd_export *exp,
@@ -85,23 +80,23 @@ int mdc_find_cbdata(struct obd_export *exp, const struct lu_fid *fid,
                     ldlm_iterator_t it, void *data);
 
 int mdc_intent_lock(struct obd_export *exp,
-                    struct md_op_data *,
-                    void *lmm, int lmmsize,
-                    struct lookup_intent *, int,
-                    struct ptlrpc_request **reqp,
+                   struct md_op_data *op_data,
+                   struct lookup_intent *it,
+                   struct ptlrpc_request **reqp,
                    ldlm_blocking_callback cb_blocking,
                    __u64 extra_lock_flags);
+
 int mdc_enqueue(struct obd_export *exp, struct ldlm_enqueue_info *einfo,
-                struct lookup_intent *it, struct md_op_data *op_data,
-                struct lustre_handle *lockh, void *lmm, int lmmsize,
-               struct ptlrpc_request **req, __u64 extra_lock_flags);
+               const union ldlm_policy_data *policy,
+               struct lookup_intent *it, struct md_op_data *op_data,
+               struct lustre_handle *lockh, __u64 extra_lock_flags);
 
 int mdc_resource_get_unused(struct obd_export *exp, const struct lu_fid *fid,
-                            cfs_list_t *cancels, ldlm_mode_t mode,
+                           struct list_head *cancels, ldlm_mode_t mode,
                             __u64 bits);
 /* mdc/mdc_request.c */
-int mdc_fid_alloc(struct obd_export *exp, struct lu_fid *fid,
-                  struct md_op_data *op_data);
+int mdc_fid_alloc(const struct lu_env *env, struct obd_export *exp,
+                 struct lu_fid *fid, struct md_op_data *op_data);
 
 int mdc_open(struct obd_export *exp, obd_id ino, int type, int flags,
              struct lov_mds_md *lmm, int lmm_size, struct lustre_handle *fh,
@@ -167,7 +162,7 @@ ldlm_mode_t mdc_lock_match(struct obd_export *exp, __u64 flags,
 
 static inline int mdc_prep_elc_req(struct obd_export *exp,
                                   struct ptlrpc_request *req, int opc,
-                                  cfs_list_t *cancels, int count)
+                                  struct list_head *cancels, int count)
 {
        return ldlm_prep_elc_req(exp, req, LUSTRE_MDS_VERSION, opc, 0, cancels,
                                 count);
@@ -179,10 +174,7 @@ static inline unsigned long hash_x_index(__u64 hash, int hash64)
        if (BITS_PER_LONG == 32 && hash64)
                hash >>= 32;
 #endif
-       /* save hash 0 as index 0 because otherwise we'll save it at
-        * page index end (~0UL) and it causes truncate_inode_pages_range()
-        * to loop forever.
-        */
+       /* save hash 0 with hash 1 */
        return ~0UL - (hash + !hash);
 }