LU-657 test: limit the write size in run_dd

[fs/lustre-release.git] / lustre / lov / lov_cl_internal.h

diff --git a/lustre/lov/lov_cl_internal.h b/lustre/lov/lov_cl_internal.h
index 3870ddf..efc8d04 100644 (file)
--- a/lustre/lov/lov_cl_internal.h
+++ b/lustre/lov/lov_cl_internal.h
@@ -26,6 +26,8 @@
 /*
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2012, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -156,7 +158,7 @@ struct lov_device {
          * Serializes access to lov_device::ld_emrg in low-memory
          * conditions.
          */
-        cfs_mutex_t               ld_mutex;
+       struct mutex              ld_mutex;
 };
 
 /**
@@ -194,7 +196,7 @@ struct lov_object {
          *
          * \see lov_object::lo_type
          */
-        cfs_rw_semaphore_t     lo_type_guard;
+       struct rw_semaphore     lo_type_guard;
         /**
          * Type of an object. Protected by lov_object::lo_type_guard.
          */
@@ -242,7 +244,7 @@ struct lov_object {
                         /**
                          * protect lo_sub
                          */
-                        cfs_spinlock_t         lo_sub_lock;
+                       spinlock_t              lo_sub_lock;
                         /**
                          * Cached object attribute, built from sub-object
                          * attributes.
@@ -424,7 +426,6 @@ struct lov_thread_info {
         struct cl_lock_descr    lti_ldescr;
         struct ost_lvb          lti_lvb;
         struct cl_2queue        lti_cl2q;
-        union  lov_layout_state lti_state;
         struct cl_lock_closure  lti_closure;
         cfs_waitlink_t          lti_waiter;
 };
@@ -580,6 +581,8 @@ int   lovsub_lock_init    (const struct lu_env *env, struct cl_object *obj,
 
 int   lov_lock_init_raid0 (const struct lu_env *env, struct cl_object *obj,
                            struct cl_lock *lock, const struct cl_io *io);
+int   lov_lock_init_empty (const struct lu_env *env, struct cl_object *obj,
+                           struct cl_lock *lock, const struct cl_io *io);
 int   lov_io_init_raid0   (const struct lu_env *env, struct cl_object *obj,
                            struct cl_io *io);
 int   lov_io_init_empty   (const struct lu_env *env, struct cl_object *obj,