b=20631 grouplock use from MDT for HSM

[fs/lustre-release.git] / lustre / mdd / mdd_device.c

diff --git a/lustre/mdd/mdd_device.c b/lustre/mdd/mdd_device.c
index 28d129c..0dbfbd4 100644 (file)
--- a/lustre/mdd/mdd_device.c
+++ b/lustre/mdd/mdd_device.c
@@ -241,7 +241,6 @@ static int mdd_changelog_init(const struct lu_env *env, struct mdd_device *mdd)
 
         mdd->mdd_cl.mc_index = 0;
         cfs_spin_lock_init(&mdd->mdd_cl.mc_lock);
-        cfs_waitq_init(&mdd->mdd_cl.mc_waitq);
         mdd->mdd_cl.mc_starttime = cfs_time_current_64();
         mdd->mdd_cl.mc_flags = 0; /* off by default */
         mdd->mdd_cl.mc_mask = CHANGELOG_DEFMASK;
@@ -330,8 +329,6 @@ int mdd_changelog_llog_write(struct mdd_device         *mdd,
         rc = llog_add(ctxt, &rec->cr_hdr, NULL, NULL, 0);
         llog_ctxt_put(ctxt);
 
-        cfs_waitq_signal(&mdd->mdd_cl.mc_waitq);
-
         return rc;
 }
 
@@ -578,6 +575,18 @@ static int dot_lustre_mdd_path(const struct lu_env *env, struct md_object *obj,
         return -ENOSYS;
 }
 
+static int dot_file_lock(const struct lu_env *env, struct md_object *obj,
+                         struct lov_mds_md *lmm, struct ldlm_extent *extent,
+                         struct lustre_handle *lockh)
+{
+        return -ENOSYS;
+}
+
+static int dot_file_unlock(const struct lu_env *env, struct md_object *obj,
+                           struct lov_mds_md *lmm, struct lustre_handle *lockh)
+{
+        return -ENOSYS;
+}
 
 static struct md_object_operations mdd_dot_lustre_obj_ops = {
         .moo_permission    = dot_lustre_mdd_permission,
@@ -599,6 +608,8 @@ static struct md_object_operations mdd_dot_lustre_obj_ops = {
         .moo_version_get   = dot_lustre_mdd_version_get,
         .moo_version_set   = dot_lustre_mdd_version_set,
         .moo_path          = dot_lustre_mdd_path,
+        .moo_file_lock     = dot_file_lock,
+        .moo_file_unlock   = dot_file_unlock,
 };