LU-2832 ptlrpc: cleanup bulk for resend case

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

diff --git a/lustre/mdd/mdd_lock.c b/lustre/mdd/mdd_lock.c
index 978eea3..7d99f7e 100644 (file)
--- a/lustre/mdd/mdd_lock.c
+++ b/lustre/mdd/mdd_lock.c
@@ -26,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/
@@ -38,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>
@@ -125,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))