Index: lustre/lov/lov_lock.c
===================================================================
--- lustre/lov/lov_lock.c       (revision 14908)
+++ lustre/lov/lov_lock.c       (working copy)
@@ -295,7 +295,7 @@
 static int lov_lock_sub_init(const struct lu_env *env,
                              struct lov_lock *lck, const struct cl_io *io)
 {
-        int result = 0;
+//        int result = 0;
         int i;
         int nr;
         obd_off start;
@@ -356,6 +356,7 @@
                 }
         }
         LASSERT(nr == lck->lls_nr);
+#if 0
         /*
          * Then, create sub-locks. Once at least one sub-lock was created,
          * top-lock can be reached by other threads.
@@ -391,12 +392,14 @@
                         cl_lock_put(env, sublock);
                 }
         }
+#endif
         /*
          * Some sub-locks can be missing at this point. This is not a problem,
          * because enqueue will create them anyway. Main duty of this function
          * is to fill in sub-lock descriptions in a race free manner.
          */
-        RETURN(result);
+//        RETURN(result);
+       return 0;
 }

 static int lov_sublock_release(const struct lu_env *env, struct lov_lock *lck,
@@ -550,7 +553,7 @@
 static int lov_sublock_fill(const struct lu_env *env, struct cl_lock *parent,
                             struct cl_io *io, struct lov_lock *lck, int idx)
 {
-        struct lov_lock_link *link;
+        struct lov_lock_link *link = NULL;
         struct cl_lock       *sublock;
         int                   result;