X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=inline;f=lustre%2Finclude%2Fdt_object.h;h=fafe05d4c2ef5ec281ee1a62e88b2a7fc93f19d6;hb=e1649d2115af001ead43afe927377d2edc50593c;hp=2d7c0dfaeb2c68aef78ae771c266f3c1f9e0b94b;hpb=8b025e890dc67a3270bcea70dfd05fcf56b02408;p=fs%2Flustre-release.git

diff --git a/lustre/include/dt_object.h b/lustre/include/dt_object.h
index 2d7c0df..fafe05d 100644
--- a/lustre/include/dt_object.h
+++ b/lustre/include/dt_object.h
@@ -449,6 +449,14 @@ struct dt_object_operations {
          */
         int (*do_data_get)(const struct lu_env *env, struct dt_object *dt,
                            void **data);
+
+	/**
+	 * Lock object.
+	 */
+	int (*do_object_lock)(const struct lu_env *env, struct dt_object *dt,
+			      struct lustre_handle *lh,
+			      struct ldlm_enqueue_info *einfo,
+			      void *policy);
 };
 
 /**
@@ -526,12 +534,6 @@ struct dt_body_operations {
                           struct lustre_capa *capa);
 };
 
-struct dt_lock_operations {
-	int (*do_object_lock)(const struct lu_env *env, struct dt_object *dt,
-			      struct lustre_handle *lh,
-			      struct ldlm_enqueue_info *einfo,
-			      void *policy);
-};
 /**
  * Incomplete type of index record.
  */
@@ -675,7 +677,6 @@ struct dt_object {
         const struct dt_object_operations *do_ops;
         const struct dt_body_operations   *do_body_ops;
         const struct dt_index_operations  *do_index_ops;
-	const struct dt_lock_operations   *do_lock_ops;
 };
 
 /*
@@ -889,9 +890,9 @@ static inline int dt_object_lock(const struct lu_env *env,
 				 void *policy)
 {
 	LASSERT(o);
-	LASSERT(o->do_lock_ops);
-	LASSERT(o->do_lock_ops->do_object_lock);
-	return o->do_lock_ops->do_object_lock(env, o, lh, einfo, policy);
+	LASSERT(o->do_ops);
+	LASSERT(o->do_ops->do_object_lock);
+	return o->do_ops->do_object_lock(env, o, lh, einfo, policy);
 }
 
 int dt_lookup_dir(const struct lu_env *env, struct dt_object *dir,