b=21448 send recovery rpc ASAP

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

diff --git a/lustre/mdd/mdd_lock.c b/lustre/mdd/mdd_lock.c
index e90ae04..4f1427d 100644 (file)
--- a/lustre/mdd/mdd_lock.c
+++ b/lustre/mdd/mdd_lock.c
@@ -51,24 +51,24 @@
 
 
 #ifdef CONFIG_LOCKDEP
-static struct lock_class_key mdd_pdirop_key;
+static cfs_lock_class_key_t mdd_pdirop_key;
 
 #define RETIP ((unsigned long)__builtin_return_address(0))
 
 static void mdd_lockdep_init(struct mdd_object *obj)
 {
-        lockdep_init_map(&obj->mod_dep_map_pdlock, "pdir", &mdd_pdirop_key);
+        lockdep_set_class_and_name(obj, &mdd_pdirop_key, "pdir");
 }
 
 static void mdd_lockdep_pd_acquire(struct mdd_object *obj,
                                    enum mdd_object_role role)
 {
-        lock_acquire(&obj->mod_dep_map_pdlock, role, 0, 1, 2, RETIP);
+        lock_acquire(&obj->dep_map, role, 0, 1, 2, RETIP);
 }
 
 static void mdd_lockdep_pd_release(struct mdd_object *obj)
 {
-        lock_release(&obj->mod_dep_map_pdlock, 0, RETIP);
+        lock_release(&obj->dep_map, 0, RETIP);
 }
 
 #else /* !CONFIG_LOCKDEP */
@@ -113,6 +113,12 @@ void mdd_read_unlock(const struct lu_env *env, struct mdd_object *obj)
         next->do_ops->do_read_unlock(env, next);
 }
 
+int mdd_write_locked(const struct lu_env *env, struct mdd_object *obj)
+{
+        struct dt_object  *next = mdd_object_child(obj);
+
+        return next->do_ops->do_write_locked(env, next);
+}
 
 /* Methods for parallel directory locking */