LU-2446 build: Update Whamcloud copyright messages for Intel

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

diff --git a/lustre/mdd/mdd_lock.c b/lustre/mdd/mdd_lock.c
index f126cc1..7d99f7e 100644 (file)
--- 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.
@@ -28,6 +26,8 @@
 /*
  * Copyright (c) 2007, 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/
@@ -40,9 +40,6 @@
  * Author: Mike Pershin <tappro@clusterfs.com>
  */
 
-#ifndef EXPORT_SYMTAB
-# define EXPORT_SYMTAB
-#endif
 #define DEBUG_SUBSYSTEM S_MDS
 
 #include <linux/module.h>
@@ -94,36 +91,32 @@ unsigned long mdd_name2hash(const char *name)
 /* Methods for parallel directory locking */
 #if MDD_DISABLE_PDO_LOCK
 
-static struct dynlock_handle *pdo_handle = (struct dynlock_handle *)0xbabecafe;
+static void *pdo_handle = (void *)0xbabecafe;
 
 void mdd_pdlock_init(struct mdd_object *obj)
 {
 }
 
-struct dynlock_handle *mdd_pdo_write_lock(const struct lu_env *env,
-                                          struct mdd_object *obj,
-                                          const char *name,
-                                          enum mdd_object_role role)
+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;
 }
 
-struct dynlock_handle *mdd_pdo_read_lock(const struct lu_env *env,
-                                         struct mdd_object *obj,
-                                         const char *name,
-                                         enum mdd_object_role role)
+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,
-                          struct dynlock_handle *dlh)
+                          void *dlh)
 {
         LASSERT(dlh == pdo_handle);
 }
 
 void mdd_pdo_read_unlock(const struct lu_env *env, struct mdd_object *obj,
-                         struct dynlock_handle *dlh)
+                         void *dlh)
 {
         LASSERT(dlh == pdo_handle);
 }
@@ -131,7 +124,7 @@ void mdd_pdo_read_unlock(const struct lu_env *env, struct mdd_object *obj,
 #else /* !MDD_DISABLE_PDO_LOCK */
 
 #ifdef CONFIG_LOCKDEP
-static cfs_lock_class_key_t mdd_pdirop_key;
+static struct lock_class_key mdd_pdirop_key;
 
 #define RETIP ((unsigned long)__builtin_return_address(0))
 
@@ -177,10 +170,8 @@ void mdd_pdlock_init(struct mdd_object *obj)
         mdd_lockdep_init(obj);
 }
 
-struct dynlock_handle *mdd_pdo_write_lock(const struct lu_env *env,
-                                          struct mdd_object *obj,
-                                          const char *name,
-                                          enum mdd_object_role role)
+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);
@@ -191,10 +182,8 @@ struct dynlock_handle *mdd_pdo_write_lock(const struct lu_env *env,
         return handle;
 }
 
-struct dynlock_handle *mdd_pdo_read_lock(const struct lu_env *env,
-                                         struct mdd_object *obj,
-                                         const char *name,
-                                         enum mdd_object_role role)
+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);
@@ -205,14 +194,14 @@ struct dynlock_handle *mdd_pdo_read_lock(const struct lu_env *env,
 }
 
 void mdd_pdo_write_unlock(const struct lu_env *env, struct mdd_object *obj,
-                          struct dynlock_handle *dlh)
+                          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,
-                         struct dynlock_handle *dlh)
+                         void *dlh)
 {
         mdd_lockdep_pd_release(obj);
         return dynlock_unlock(&obj->mod_pdlock, dlh);