LU-6865 mdd: check return value of posix_acl_from_xattr

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

diff --git a/lustre/mdd/mdd_lock.c b/lustre/mdd/mdd_lock.c
index d9921af..0db27f3 100644 (file)
--- a/lustre/mdd/mdd_lock.c
+++ b/lustre/mdd/mdd_lock.c
@@ -27,7 +27,7 @@
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, Intel Corporation.
+ * Copyright (c) 2012, 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -47,156 +47,38 @@
 #include "mdd_internal.h"
 
 void mdd_write_lock(const struct lu_env *env, struct mdd_object *obj,
-                    enum mdd_object_role role)
+                   enum mdd_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, role);
+       dt_write_lock(env, next, role);
 }
 
 void mdd_read_lock(const struct lu_env *env, struct mdd_object *obj,
-                   enum mdd_object_role role)
+                  enum mdd_object_role role)
 {
-        struct dt_object  *next = mdd_object_child(obj);
+       struct dt_object *next = mdd_object_child(obj);
 
-        next->do_ops->do_read_lock(env, next, role);
+       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);
+       struct dt_object *next = mdd_object_child(obj);
 
-        next->do_ops->do_read_unlock(env, next);
+       dt_read_unlock(env, next);
 }
 
 int mdd_write_locked(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);
 
-        return next->do_ops->do_write_locked(env, next);
+       return dt_write_locked(env, next);
 }
-
-unsigned long mdd_name2hash(const char *name)
-{
-        return full_name_hash((unsigned char*)name, strlen(name));
-}
-
-/* Methods for parallel directory locking */
-#if MDD_DISABLE_PDO_LOCK
-
-static void *pdo_handle = (void *)0xbabecafe;
-
-void mdd_pdlock_init(struct mdd_object *obj)
-{
-}
-
-void *mdd_pdo_write_lock(const struct lu_env *env, struct mdd_object *obj,
-                         const char *name, enum mdd_object_role role)
-{
-        return pdo_handle;
-}
-
-void *mdd_pdo_read_lock(const struct lu_env *env, struct mdd_object *obj,
-                        const char *name, enum mdd_object_role role)
-{
-        return pdo_handle;
-}
-
-void mdd_pdo_write_unlock(const struct lu_env *env, struct mdd_object *obj,
-                          void *dlh)
-{
-        LASSERT(dlh == pdo_handle);
-}
-
-void mdd_pdo_read_unlock(const struct lu_env *env, struct mdd_object *obj,
-                         void *dlh)
-{
-        LASSERT(dlh == pdo_handle);
-}
-
-#else /* !MDD_DISABLE_PDO_LOCK */
-
-#ifdef CONFIG_LOCKDEP
-static struct lock_class_key mdd_pdirop_key;
-
-#define RETIP ((unsigned long)__builtin_return_address(0))
-
-static void mdd_lockdep_init(struct mdd_object *obj)
-{
-        lockdep_set_class_and_name(obj, &mdd_pdirop_key, "pdir");
-}
-
-static void mdd_lockdep_pd_acquire(struct mdd_object *obj,
-                                   enum mdd_object_role role)
-{
-        lock_map_acquire(&obj->dep_map);
-}
-
-static void mdd_lockdep_pd_release(struct mdd_object *obj)
-{
-        lock_map_release(&obj->dep_map);
-}
-
-#else /* !CONFIG_LOCKDEP */
-
-static void mdd_lockdep_init(struct mdd_object *obj)
-{}
-static void mdd_lockdep_pd_acquire(struct mdd_object *obj,
-                                   enum mdd_object_role role)
-{}
-static void mdd_lockdep_pd_release(struct mdd_object *obj)
-{}
-
-#endif /* !CONFIG_LOCKDEP */
-
-void mdd_pdlock_init(struct mdd_object *obj)
-{
-        dynlock_init(&obj->mod_pdlock);
-        mdd_lockdep_init(obj);
-}
-
-void *mdd_pdo_write_lock(const struct lu_env *env, struct mdd_object *obj,
-                         const char *name, enum mdd_object_role role)
-{
-        struct dynlock_handle *handle;
-        unsigned long value = mdd_name2hash(name);
-
-        handle = dynlock_lock(&obj->mod_pdlock, value, DLT_WRITE, GFP_NOFS);
-        if (handle != NULL)
-                mdd_lockdep_pd_acquire(obj, role);
-        return handle;
-}
-
-void *mdd_pdo_read_lock(const struct lu_env *env, struct mdd_object *obj,
-                        const char *name, enum mdd_object_role role)
-{
-        struct dynlock_handle *handle;
-        unsigned long value = mdd_name2hash(name);
-        handle = dynlock_lock(&obj->mod_pdlock, value, DLT_READ, GFP_NOFS);
-        if (handle != NULL)
-                mdd_lockdep_pd_acquire(obj, role);
-        return handle;
-}
-
-void mdd_pdo_write_unlock(const struct lu_env *env, struct mdd_object *obj,
-                          void *dlh)
-{
-        mdd_lockdep_pd_release(obj);
-        return dynlock_unlock(&obj->mod_pdlock, dlh);
-}
-
-void mdd_pdo_read_unlock(const struct lu_env *env, struct mdd_object *obj,
-                         void *dlh)
-{
-        mdd_lockdep_pd_release(obj);
-        return dynlock_unlock(&obj->mod_pdlock, dlh);
-}
-
-#endif /* MDD_DISABLE_PDO_LOCK */