diff options
Diffstat (limited to 'fs/ocfs2')
-rw-r--r-- | fs/ocfs2/cluster/heartbeat.c | 2 | ||||
-rw-r--r-- | fs/ocfs2/cluster/tcp.c | 2 | ||||
-rw-r--r-- | fs/ocfs2/dlm/dlmdomain.c | 2 | ||||
-rw-r--r-- | fs/ocfs2/dlm/dlmlock.c | 2 | ||||
-rw-r--r-- | fs/ocfs2/dlm/dlmrecovery.c | 4 | ||||
-rw-r--r-- | fs/ocfs2/dlmglue.c | 2 | ||||
-rw-r--r-- | fs/ocfs2/journal.c | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/fs/ocfs2/cluster/heartbeat.c b/fs/ocfs2/cluster/heartbeat.c index 21f38accd039..1d26cfcd9f84 100644 --- a/fs/ocfs2/cluster/heartbeat.c +++ b/fs/ocfs2/cluster/heartbeat.c | |||
@@ -54,7 +54,7 @@ static DECLARE_RWSEM(o2hb_callback_sem); | |||
54 | * multiple hb threads are watching multiple regions. A node is live | 54 | * multiple hb threads are watching multiple regions. A node is live |
55 | * whenever any of the threads sees activity from the node in its region. | 55 | * whenever any of the threads sees activity from the node in its region. |
56 | */ | 56 | */ |
57 | static spinlock_t o2hb_live_lock = SPIN_LOCK_UNLOCKED; | 57 | static DEFINE_SPINLOCK(o2hb_live_lock); |
58 | static struct list_head o2hb_live_slots[O2NM_MAX_NODES]; | 58 | static struct list_head o2hb_live_slots[O2NM_MAX_NODES]; |
59 | static unsigned long o2hb_live_node_bitmap[BITS_TO_LONGS(O2NM_MAX_NODES)]; | 59 | static unsigned long o2hb_live_node_bitmap[BITS_TO_LONGS(O2NM_MAX_NODES)]; |
60 | static LIST_HEAD(o2hb_node_events); | 60 | static LIST_HEAD(o2hb_node_events); |
diff --git a/fs/ocfs2/cluster/tcp.c b/fs/ocfs2/cluster/tcp.c index 0f60cc0d3985..1591eb37a723 100644 --- a/fs/ocfs2/cluster/tcp.c +++ b/fs/ocfs2/cluster/tcp.c | |||
@@ -108,7 +108,7 @@ | |||
108 | ##args); \ | 108 | ##args); \ |
109 | } while (0) | 109 | } while (0) |
110 | 110 | ||
111 | static rwlock_t o2net_handler_lock = RW_LOCK_UNLOCKED; | 111 | static DEFINE_RWLOCK(o2net_handler_lock); |
112 | static struct rb_root o2net_handler_tree = RB_ROOT; | 112 | static struct rb_root o2net_handler_tree = RB_ROOT; |
113 | 113 | ||
114 | static struct o2net_node o2net_nodes[O2NM_MAX_NODES]; | 114 | static struct o2net_node o2net_nodes[O2NM_MAX_NODES]; |
diff --git a/fs/ocfs2/dlm/dlmdomain.c b/fs/ocfs2/dlm/dlmdomain.c index ba27c5c5e959..b8c23f7ba67e 100644 --- a/fs/ocfs2/dlm/dlmdomain.c +++ b/fs/ocfs2/dlm/dlmdomain.c | |||
@@ -88,7 +88,7 @@ out_free: | |||
88 | * | 88 | * |
89 | */ | 89 | */ |
90 | 90 | ||
91 | spinlock_t dlm_domain_lock = SPIN_LOCK_UNLOCKED; | 91 | DEFINE_SPINLOCK(dlm_domain_lock); |
92 | LIST_HEAD(dlm_domains); | 92 | LIST_HEAD(dlm_domains); |
93 | static DECLARE_WAIT_QUEUE_HEAD(dlm_domain_events); | 93 | static DECLARE_WAIT_QUEUE_HEAD(dlm_domain_events); |
94 | 94 | ||
diff --git a/fs/ocfs2/dlm/dlmlock.c b/fs/ocfs2/dlm/dlmlock.c index d6f89577e25f..5ca57ec650c7 100644 --- a/fs/ocfs2/dlm/dlmlock.c +++ b/fs/ocfs2/dlm/dlmlock.c | |||
@@ -53,7 +53,7 @@ | |||
53 | #define MLOG_MASK_PREFIX ML_DLM | 53 | #define MLOG_MASK_PREFIX ML_DLM |
54 | #include "cluster/masklog.h" | 54 | #include "cluster/masklog.h" |
55 | 55 | ||
56 | static spinlock_t dlm_cookie_lock = SPIN_LOCK_UNLOCKED; | 56 | static DEFINE_SPINLOCK(dlm_cookie_lock); |
57 | static u64 dlm_next_cookie = 1; | 57 | static u64 dlm_next_cookie = 1; |
58 | 58 | ||
59 | static enum dlm_status dlm_send_remote_lock_request(struct dlm_ctxt *dlm, | 59 | static enum dlm_status dlm_send_remote_lock_request(struct dlm_ctxt *dlm, |
diff --git a/fs/ocfs2/dlm/dlmrecovery.c b/fs/ocfs2/dlm/dlmrecovery.c index da399013516f..29b2845f370d 100644 --- a/fs/ocfs2/dlm/dlmrecovery.c +++ b/fs/ocfs2/dlm/dlmrecovery.c | |||
@@ -98,8 +98,8 @@ static void dlm_mig_lockres_worker(struct dlm_work_item *item, void *data); | |||
98 | 98 | ||
99 | static u64 dlm_get_next_mig_cookie(void); | 99 | static u64 dlm_get_next_mig_cookie(void); |
100 | 100 | ||
101 | static spinlock_t dlm_reco_state_lock = SPIN_LOCK_UNLOCKED; | 101 | static DEFINE_SPINLOCK(dlm_reco_state_lock); |
102 | static spinlock_t dlm_mig_cookie_lock = SPIN_LOCK_UNLOCKED; | 102 | static DEFINE_SPINLOCK(dlm_mig_cookie_lock); |
103 | static u64 dlm_mig_cookie = 1; | 103 | static u64 dlm_mig_cookie = 1; |
104 | 104 | ||
105 | static u64 dlm_get_next_mig_cookie(void) | 105 | static u64 dlm_get_next_mig_cookie(void) |
diff --git a/fs/ocfs2/dlmglue.c b/fs/ocfs2/dlmglue.c index 64cd52860c87..4acd37286bdd 100644 --- 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, | |||
242 | mlog_exit_void(); | 242 | mlog_exit_void(); |
243 | } | 243 | } |
244 | 244 | ||
245 | static spinlock_t ocfs2_dlm_tracking_lock = SPIN_LOCK_UNLOCKED; | 245 | static DEFINE_SPINLOCK(ocfs2_dlm_tracking_lock); |
246 | 246 | ||
247 | static void ocfs2_add_lockres_tracking(struct ocfs2_lock_res *res, | 247 | static void ocfs2_add_lockres_tracking(struct ocfs2_lock_res *res, |
248 | struct ocfs2_dlm_debug *dlm_debug) | 248 | struct ocfs2_dlm_debug *dlm_debug) |
diff --git a/fs/ocfs2/journal.c b/fs/ocfs2/journal.c index 3fe8781c22cb..910a601b2e98 100644 --- a/fs/ocfs2/journal.c +++ b/fs/ocfs2/journal.c | |||
@@ -49,7 +49,7 @@ | |||
49 | 49 | ||
50 | #include "buffer_head_io.h" | 50 | #include "buffer_head_io.h" |
51 | 51 | ||
52 | spinlock_t trans_inc_lock = SPIN_LOCK_UNLOCKED; | 52 | DEFINE_SPINLOCK(trans_inc_lock); |
53 | 53 | ||
54 | static int ocfs2_force_read_journal(struct inode *inode); | 54 | static int ocfs2_force_read_journal(struct inode *inode); |
55 | static int ocfs2_recover_node(struct ocfs2_super *osb, | 55 | static int ocfs2_recover_node(struct ocfs2_super *osb, |