X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmdd%2Fmdd_lock.c;h=b8e6598669af85d201f4f79fccabd53d911ddc18;hb=d8ff73097be78cc3e603ab49b6aaa03a1c766fcb;hp=0db27f364178d4d0e1e08a60a356f0054aa05a2b;hpb=2b294992edce5af7b79d4300ed3aa1ea6a8db850;p=fs%2Flustre-release.git

diff --git a/lustre/mdd/mdd_lock.c b/lustre/mdd/mdd_lock.c
index 0db27f3..b8e6598 100644
--- 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);