diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-12 21:14:25 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-12 21:14:25 -0400 |
| commit | 25d500067d5a666d1336598d1b324793554e5496 (patch) | |
| tree | 3402308c4c69a66d02ce55f5c165e242fad2a8a9 /fs/ocfs2/ocfs2.h | |
| parent | 0b13fda1e0936b3d64c4c407f183d33fa6bd2ad4 (diff) | |
| parent | 9ead64974b05501bbac0d63a47c99fa786d064ba (diff) | |
Merge branch 'linus' into core/ipi
Diffstat (limited to 'fs/ocfs2/ocfs2.h')
| -rw-r--r-- | fs/ocfs2/ocfs2.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h index 077384135f4e..946d3c34b90b 100644 --- a/fs/ocfs2/ocfs2.h +++ b/fs/ocfs2/ocfs2.h | |||
| @@ -341,6 +341,9 @@ struct ocfs2_super | |||
| 341 | struct ocfs2_node_map osb_recovering_orphan_dirs; | 341 | struct ocfs2_node_map osb_recovering_orphan_dirs; |
| 342 | unsigned int *osb_orphan_wipes; | 342 | unsigned int *osb_orphan_wipes; |
| 343 | wait_queue_head_t osb_wipe_event; | 343 | wait_queue_head_t osb_wipe_event; |
| 344 | |||
| 345 | /* used to protect metaecc calculation check of xattr. */ | ||
| 346 | spinlock_t osb_xattr_lock; | ||
| 344 | }; | 347 | }; |
| 345 | 348 | ||
| 346 | #define OCFS2_SB(sb) ((struct ocfs2_super *)(sb)->s_fs_info) | 349 | #define OCFS2_SB(sb) ((struct ocfs2_super *)(sb)->s_fs_info) |