X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmdd%2Fmdd_lock.c;h=768ee774f9a38771134df9ce347972392b24f5b1;hb=979f5e1db041dc49585b97c4915a6bc3e58435da;hp=3b13db74f06cb91b2f99bdf9a1a346888a1975e9;hpb=6869932b552ac705f411de3362f01bd50c1f6f7d;p=fs%2Flustre-release.git

diff --git a/lustre/mdd/mdd_lock.c b/lustre/mdd/mdd_lock.c
index 3b13db7..768ee774 100644
--- a/lustre/mdd/mdd_lock.c
+++ b/lustre/mdd/mdd_lock.c
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -17,17 +15,15 @@
  *
  * 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
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2012, 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -40,80 +36,44 @@
  * Author: Mike Pershin <tappro@clusterfs.com>
  */
 
-#ifndef EXPORT_SYMTAB
-# define EXPORT_SYMTAB
-#endif
 #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)
+void mdd_write_lock(const struct lu_env *env, struct mdd_object *obj,
+		    enum dt_object_role role)
 {
-        struct dt_object  *next = mdd_object_child(obj);
+	struct dt_object *next = mdd_object_child(obj);
 
-        next->do_ops->do_write_lock(env, next);
+	dt_write_lock(env, next, role);
 }
 
-void mdd_read_lock(const struct lu_env *env, struct mdd_object *obj)
+void mdd_read_lock(const struct lu_env *env, struct mdd_object *obj,
+		   enum dt_object_role role)
 {
-        struct dt_object  *next = mdd_object_child(obj);
-        next->do_ops->do_read_lock(env, next);
+	struct dt_object *next = mdd_object_child(obj);
+
+	dt_read_lock(env, next, role);
 }
 
 void mdd_write_unlock(const struct lu_env *env, struct mdd_object *obj)
 {
-        struct dt_object  *next = mdd_object_child(obj);
+	struct dt_object *next = mdd_object_child(obj);
 
-        next->do_ops->do_write_unlock(env, next);
+	dt_write_unlock(env, next);
 }
 
 void mdd_read_unlock(const struct lu_env *env, struct mdd_object *obj)
 {
-        struct dt_object  *next = mdd_object_child(obj);
-
-        next->do_ops->do_read_unlock(env, next);
-}
-
-
-/* Methods for parallel directory locking */
-
-void mdd_pdlock_init(struct mdd_object *obj)
-{
-        dynlock_init(&obj->mod_pdlock);
+	struct dt_object *next = mdd_object_child(obj);
 
+	dt_read_unlock(env, next);
 }
 
-unsigned long mdd_name2hash(const char *name)
+int mdd_write_locked(const struct lu_env *env, struct mdd_object *obj)
 {
-        return full_name_hash((unsigned char*)name, strlen(name));
-}
-
-struct dynlock_handle *mdd_pdo_write_lock(const struct lu_env *env,
-                                          struct mdd_object *obj,
-                                          const char *name)
-{
-        unsigned long value = mdd_name2hash(name);
-        return dynlock_lock(&obj->mod_pdlock, value, DLT_WRITE, GFP_NOFS);
-}
+	struct dt_object *next = mdd_object_child(obj);
 
-struct dynlock_handle *mdd_pdo_read_lock(const struct lu_env *env,
-                                         struct mdd_object *obj,
-                                         const char *name)
-{
-        unsigned long value = mdd_name2hash(name);
-        return dynlock_lock(&obj->mod_pdlock, value, DLT_READ, GFP_NOFS);
-}
-
-void mdd_pdo_write_unlock(const struct lu_env *env, struct mdd_object *obj,
-                          struct dynlock_handle *dlh)
-{
-        return dynlock_unlock(&obj->mod_pdlock, dlh);
-}
-
-void mdd_pdo_read_unlock(const struct lu_env *env, struct mdd_object *obj,
-                         struct dynlock_handle *dlh)
-{
-        return dynlock_unlock(&obj->mod_pdlock, dlh);
+	return dt_write_locked(env, next);
 }