git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
[sfrench/cifs-2.6.git]
/
fs
/
ocfs2
/
dlmglue.c
diff --git
a/fs/ocfs2/dlmglue.c
b/fs/ocfs2/dlmglue.c
index 64cd52860c876943d3a51a373f8a74df9f7067f5..4acd37286bdd7cb4b0807da5b338a9f6753ffb99 100644
(file)
--- a/
fs/ocfs2/dlmglue.c
+++ b/
fs/ocfs2/dlmglue.c
@@
-242,7
+242,7
@@
static void ocfs2_build_lock_name(enum ocfs2_lock_type type,
mlog_exit_void();
}
-static
spinlock_t ocfs2_dlm_tracking_lock = SPIN_LOCK_UNLOCKED
;
+static
DEFINE_SPINLOCK(ocfs2_dlm_tracking_lock)
;
static void ocfs2_add_lockres_tracking(struct ocfs2_lock_res *res,
struct ocfs2_dlm_debug *dlm_debug)