Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-3500 mdt: use __u64 for sp_cr_flags
[fs/lustre-release.git]
/
lustre
/
mdd
/
mdd_lock.c
diff --git
a/lustre/mdd/mdd_lock.c
b/lustre/mdd/mdd_lock.c
index
1fdbd8b
..
d9921af
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) 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/
*/
/*
* This file is part of Lustre, http://www.lustre.org/
@@
-122,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
#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))
#define RETIP ((unsigned long)__builtin_return_address(0))
@@
-134,20
+136,12
@@
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_acquire(struct mdd_object *obj,
enum mdd_object_role role)
{
-#ifdef HAVE_LOCK_MAP_ACQUIRE
lock_map_acquire(&obj->dep_map);
lock_map_acquire(&obj->dep_map);
-#else
- lock_acquire(&obj->dep_map, role, 0, 1, 2, RETIP);
-#endif
}
static void mdd_lockdep_pd_release(struct mdd_object *obj)
{
}
static void mdd_lockdep_pd_release(struct mdd_object *obj)
{
-#ifdef HAVE_LOCK_MAP_ACQUIRE
lock_map_release(&obj->dep_map);
lock_map_release(&obj->dep_map);
-#else
- lock_release(&obj->dep_map, 0, RETIP);
-#endif
}
#else /* !CONFIG_LOCKDEP */
}
#else /* !CONFIG_LOCKDEP */