LU-15011 tests: pool spill test modifications

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

diff --git a/lustre/mdd/mdd_lock.c b/lustre/mdd/mdd_lock.c
index 0db27f3..b8e6598 100644 (file)
--- a/lustre/mdd/mdd_lock.c
+++ b/lustre/mdd/mdd_lock.c
@@ -15,11 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
@@ -31,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
  *
  * lustre/mdd/mdd_lock.c
  *
@@ -43,11 +38,10 @@
 #define DEBUG_SUBSYSTEM S_MDS
 
 #include <linux/module.h>
-#include <lustre_ver.h>
 #include "mdd_internal.h"
 
 void mdd_write_lock(const struct lu_env *env, struct mdd_object *obj,
-                   enum mdd_object_role role)
+                   enum dt_object_role role)
 {
        struct dt_object *next = mdd_object_child(obj);
 
@@ -55,7 +49,7 @@ void mdd_write_lock(const struct lu_env *env, struct mdd_object *obj,
 }
 
 void mdd_read_lock(const struct lu_env *env, struct mdd_object *obj,
-                  enum mdd_object_role role)
+                  enum dt_object_role role)
 {
        struct dt_object *next = mdd_object_child(obj);