This commit was manufactured by cvs2svn to create branch 'vserver'.

[linux-2.6.git] / fs / jfs / jfs_incore.h

diff --git a/fs/jfs/jfs_incore.h b/fs/jfs/jfs_incore.h
index ac608c9..2357d95 100644 (file)
--- a/fs/jfs/jfs_incore.h
+++ b/fs/jfs/jfs_incore.h
@@ -21,7 +21,7 @@
 
 #include <linux/rwsem.h>
 #include <linux/slab.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include "jfs_types.h"
 #include "jfs_xtree.h"
 #include "jfs_dtree.h"
@@ -53,6 +53,7 @@ struct jfs_inode_info {
        lid_t   blid;           /* lid of pseudo buffer?        */
        lid_t   atlhead;        /* anonymous tlock list head    */
        lid_t   atltail;        /* anonymous tlock list tail    */
+       spinlock_t ag_lock;     /* protects active_ag           */
        struct list_head anon_inode_list; /* inodes having anonymous txns */
        /*
         * rdwrlock serializes xtree between reads & writes and synchronizes