X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=lustre%2Finclude%2Fcl_object.h;h=9996eb313c4c8718a802727db9eb44fbf8c016af;hb=51459371a2e146d01f9d2ef27fdf75d77639266f;hp=563edd1ac2d73ab3528e7038478e00319e8f4e57;hpb=020c0a8c6ac50ab1b7d0a240722b90c7c31b64c1;p=fs%2Flustre-release.git

diff --git a/lustre/include/cl_object.h b/lustre/include/cl_object.h
index 563edd1..9996eb3 100644
--- a/lustre/include/cl_object.h
+++ b/lustre/include/cl_object.h
@@ -1570,6 +1570,10 @@ struct cl_lock {
          */
         struct list_head      cll_inclosure;
         /**
+         * Confict lock at queuing time.
+         */
+        struct cl_lock       *cll_conflict;
+        /**
          * A list of references to this lock, for debugging.
          */
         struct lu_ref         cll_reference;
@@ -2783,8 +2787,6 @@ void  cl_lock_release   (const struct lu_env *env, struct cl_lock *lock,
                          const char *scope, const void *source);
 void  cl_lock_user_add  (const struct lu_env *env, struct cl_lock *lock);
 int   cl_lock_user_del  (const struct lu_env *env, struct cl_lock *lock);
-int   cl_lock_compatible(const struct cl_lock *lock1,
-                         const struct cl_lock *lock2);
 
 enum cl_lock_state cl_lock_intransit(const struct lu_env *env,
                                      struct cl_lock *lock);