X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=lustre%2Fmdc%2Fmdc_internal.h;h=44e0e20f136e3b4f81f11aeaf77ea8a66fcc2d33;hb=2a63fa84d379e4261dcdb40ee25cbf3547a9de0a;hp=ac709b0f72d0536950ffea304f4d0bee36a01289;hpb=2e6f5c160a4acdd509ca7b4245e96ed83b19bb57;p=fs%2Flustre-release.git

diff --git a/lustre/mdc/mdc_internal.h b/lustre/mdc/mdc_internal.h
index ac709b0..44e0e20 100644
--- a/lustre/mdc/mdc_internal.h
+++ b/lustre/mdc/mdc_internal.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  */
 /*
@@ -84,6 +84,9 @@ int mdc_set_lock_data(struct obd_export *exp,
 int mdc_change_cbdata(struct obd_export *exp, const struct lu_fid *fid,
                       ldlm_iterator_t it, void *data);
 
+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,
@@ -96,7 +99,7 @@ int mdc_enqueue(struct obd_export *exp, struct ldlm_enqueue_info *einfo,
                 struct ptlrpc_request **req, int extra_lock_flags);
 
 int mdc_resource_get_unused(struct obd_export *exp, struct lu_fid *fid,
-                            struct list_head *cancels, ldlm_mode_t mode,
+                            cfs_list_t *cancels, ldlm_mode_t mode,
                             __u64 bits);
 /* mdc/mdc_request.c */
 int mdc_fid_alloc(struct obd_export *exp, struct lu_fid *fid,
@@ -139,7 +142,7 @@ int mdc_unlink(struct obd_export *exp, struct md_op_data *op_data,
                struct ptlrpc_request **request);
 int mdc_cancel_unused(struct obd_export *exp, const struct lu_fid *fid,
                       ldlm_policy_data_t *policy, ldlm_mode_t mode,
-                      int flags, void *opaque);
+                      ldlm_cancel_flags_t flags, void *opaque);
 
 static inline void mdc_set_capa_size(struct ptlrpc_request *req,
                                      const struct req_msg_field *field,
@@ -152,8 +155,7 @@ static inline void mdc_set_capa_size(struct ptlrpc_request *req,
                 ;
 }
 
-int mdc_revalidate_lock(struct obd_export *exp,
-                        struct lookup_intent *it,
+int mdc_revalidate_lock(struct obd_export *exp, struct lookup_intent *it,
                         struct lu_fid *fid);
 
 int mdc_intent_getattr_async(struct obd_export *exp,