diff options
| author |   David S. Miller <davem@davemloft.net> | 2009-03-01 21:35:16 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-01 21:35:16 -0800 |
| commit | aa4abc9bcce0d2a7ec189e897f8f8c58ca04643b (patch) | |
| tree | 22ef88d84a2e06380bb6a853c3ba28657e4e5f92 /fs/ocfs2/ocfs2.h | |
| parent | jme: Adding {64,40}bits DMA mask back (diff) | |
| parent | zaurus: add usb id for motomagx phones (diff) | |
| download | linux-dev-aa4abc9bcce0d2a7ec189e897f8f8c58ca04643b.tar.xz linux-dev-aa4abc9bcce0d2a7ec189e897f8f8c58ca04643b.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-tx.c
net/8021q/vlan_core.c
net/core/dev.c
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 struct ocfs2_node_map osb_recovering_orphan_dirs; unsigned int *osb_orphan_wipes; wait_queue_head_t osb_wipe_event; + + /* used to protect metaecc calculation check of xattr. */ + spinlock_t osb_xattr_lock; }; #define OCFS2_SB(sb) ((struct ocfs2_super *)(sb)->s_fs_info) |