b=17809

i=Nikita
i=Rahul

	fix for lockdep warning. adds separate lockdep subclass for mdd_orphan
dir locking.

diff --git a/lustre/mdd/mdd_internal.h b/lustre/mdd/mdd_internal.h
index d6729e2..746047e 100644 (file)
--- a/lustre/mdd/mdd_internal.h
+++ b/lustre/mdd/mdd_internal.h
@@ -119,7 +119,8 @@ enum mdd_object_role {
         MOR_SRC_PARENT,
         MOR_SRC_CHILD,
         MOR_TGT_PARENT,
-        MOR_TGT_CHILD
+        MOR_TGT_CHILD,
+        MOR_TGT_ORPHAN
 };
 
 struct mdd_object {

diff --git a/lustre/mdd/mdd_orphans.c b/lustre/mdd/mdd_orphans.c
index e587094..506916e 100644 (file)
--- a/lustre/mdd/mdd_orphans.c
+++ b/lustre/mdd/mdd_orphans.c
@@ -120,7 +120,7 @@ static inline void mdd_orphan_write_lock(const struct lu_env *env,
 {
 
         struct dt_object        *dor    = mdd->mdd_orphans;
-        dor->do_ops->do_write_lock(env, dor, MOR_TGT_CHILD);
+        dor->do_ops->do_write_lock(env, dor, MOR_TGT_ORPHAN);
 }
 
 static inline void mdd_orphan_write_unlock(const struct lu_env *env,