diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-18 14:15:05 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-18 14:15:05 -0500 |
| commit | 4092762aebfe55c1f8e31440b80a053c2dbe519b (patch) | |
| tree | 8fb9fd14131194174c12daf5d8195afd3b62bc3e /fs/dlm/dlm_internal.h | |
| parent | 745b1626dd71ce9661a05ea4db57859ed5c773d2 (diff) | |
| parent | 1de9e8e70f5acc441550ca75433563d91b269bbe (diff) | |
Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc2' into tracing/core
Diffstat (limited to 'fs/dlm/dlm_internal.h')
| -rw-r--r-- | fs/dlm/dlm_internal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/dlm/dlm_internal.h b/fs/dlm/dlm_internal.h index ef2f1e353966..076e86f38bc8 100644 --- a/fs/dlm/dlm_internal.h +++ b/fs/dlm/dlm_internal.h | |||
| @@ -105,7 +105,7 @@ struct dlm_dirtable { | |||
| 105 | struct dlm_rsbtable { | 105 | struct dlm_rsbtable { |
| 106 | struct list_head list; | 106 | struct list_head list; |
| 107 | struct list_head toss; | 107 | struct list_head toss; |
| 108 | rwlock_t lock; | 108 | spinlock_t lock; |
| 109 | }; | 109 | }; |
| 110 | 110 | ||
| 111 | struct dlm_lkbtable { | 111 | struct dlm_lkbtable { |