diff options
| author | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
| commit | d120cfb544ed6161b9d32fb6c4648c471807ee6b (patch) | |
| tree | 7757ad0198d8df76ff5c60f939a687687c41da00 /fs/ocfs2/dlm/dlmrecovery.c | |
| parent | 9dce0e950dbfab4148f35ac6f297d8638cdc63c4 (diff) | |
| parent | bf7e8511088963078484132636839b59e25cf14f (diff) | |
merge linus into release branch
Conflicts:
drivers/acpi/acpi_memhotplug.c
Diffstat (limited to 'fs/ocfs2/dlm/dlmrecovery.c')
| -rw-r--r-- | fs/ocfs2/dlm/dlmrecovery.c | 4 |
1 files changed, 2 insertions, 2 deletions
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) |