Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6

[karo-tx-linux.git] / fs / ocfs2 / ocfs2.h

diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h
index 740f448041e2e66bef6792166f93c0df838a6785..1238b491db90d5635059f07a44178b8a7e9a1571 100644 (file)
--- a/fs/ocfs2/ocfs2.h
+++ b/fs/ocfs2/ocfs2.h
@@ -42,6 +42,7 @@
 
 #include "ocfs2_fs.h"
 #include "ocfs2_lockid.h"
+#include "ocfs2_ioctl.h"
 
 /* For struct ocfs2_blockcheck_stats */
 #include "blockcheck.h"
@@ -159,7 +160,7 @@ struct ocfs2_lock_res {
        int                      l_level;
        unsigned int             l_ro_holders;
        unsigned int             l_ex_holders;
-       union ocfs2_dlm_lksb     l_lksb;
+       struct ocfs2_dlm_lksb    l_lksb;
 
        /* used from AST/BAST funcs. */
        enum ocfs2_ast_action    l_action;
@@ -305,7 +306,9 @@ struct ocfs2_super
        u32 s_next_generation;
        unsigned long osb_flags;
        s16 s_inode_steal_slot;
+       s16 s_meta_steal_slot;
        atomic_t s_num_inodes_stolen;
+       atomic_t s_num_meta_stolen;
 
        unsigned long s_mount_opt;
        unsigned int s_atime_quantum;
@@ -760,33 +763,6 @@ static inline unsigned int ocfs2_megabytes_to_clusters(struct super_block *sb,
        return megs << (20 - OCFS2_SB(sb)->s_clustersize_bits);
 }
 
-static inline void ocfs2_init_inode_steal_slot(struct ocfs2_super *osb)
-{
-       spin_lock(&osb->osb_lock);
-       osb->s_inode_steal_slot = OCFS2_INVALID_SLOT;
-       spin_unlock(&osb->osb_lock);
-       atomic_set(&osb->s_num_inodes_stolen, 0);
-}
-
-static inline void ocfs2_set_inode_steal_slot(struct ocfs2_super *osb,
-                                             s16 slot)
-{
-       spin_lock(&osb->osb_lock);
-       osb->s_inode_steal_slot = slot;
-       spin_unlock(&osb->osb_lock);
-}
-
-static inline s16 ocfs2_get_inode_steal_slot(struct ocfs2_super *osb)
-{
-       s16 slot;
-
-       spin_lock(&osb->osb_lock);
-       slot = osb->s_inode_steal_slot;
-       spin_unlock(&osb->osb_lock);
-
-       return slot;
-}
-
 #define ocfs2_set_bit ext2_set_bit
 #define ocfs2_clear_bit ext2_clear_bit
 #define ocfs2_test_bit ext2_test_bit