From 7591a257336c9c4b44b6827ecc3c5f3aa7b4cf70 Mon Sep 17 00:00:00 2001
From: David Teigland <teigland@redhat.com>
Date: Thu, 2 Aug 2012 11:00:05 -0500
Subject: [PATCH] --- yaml --- r: 326214 b: refs/heads/master c:
 6ad2291624824c1de19dbbbbb6d4f9f601b60781 h: refs/heads/master v: v3

---
 [refs]             | 2 +-
 trunk/fs/dlm/ast.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 1e52b31b4925..7b6da4b17d4f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 36b71a8bfbc92e1ba164e9aec840c0180ee933b5
+refs/heads/master: 6ad2291624824c1de19dbbbbb6d4f9f601b60781
diff --git a/trunk/fs/dlm/ast.c b/trunk/fs/dlm/ast.c
index 63dc19c54d5a..27a6ba9aaeec 100644
--- a/trunk/fs/dlm/ast.c
+++ b/trunk/fs/dlm/ast.c
@@ -15,8 +15,8 @@
 #include "lock.h"
 #include "user.h"
 
-static uint64_t			dlm_cb_seq;
-static spinlock_t		dlm_cb_seq_spin;
+static uint64_t dlm_cb_seq;
+static DEFINE_SPINLOCK(dlm_cb_seq_spin);
 
 static void dlm_dump_lkb_callbacks(struct dlm_lkb *lkb)
 {