Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight

[linux-2.6-omap-h63xx.git] / fs / btrfs / btrfs_inode.h

diff --git a/fs/btrfs/btrfs_inode.h b/fs/btrfs/btrfs_inode.h
index 0b2e623cf42101aaea05262a15d6c1d2b6b0c526..a8c9693b75ac42e939edaede65a29a31244d66c8 100644 (file)
--- a/fs/btrfs/btrfs_inode.h
+++ b/fs/btrfs/btrfs_inode.h
@@ -28,11 +28,6 @@ struct btrfs_inode {
        /* which subvolume this inode belongs to */
        struct btrfs_root *root;
 
-       /* the block group preferred for allocations.  This pointer is buggy
-        * and needs to be replaced with a bytenr instead
-        */
-       struct btrfs_block_group_cache *block_group;
-
        /* key used to find this inode on disk.  This is used by the code
         * to read in roots of subvolumes
         */
@@ -49,9 +44,6 @@ struct btrfs_inode {
         */
        struct extent_io_tree io_failure_tree;
 
-       /* held while inserting checksums to avoid races */
-       struct mutex csum_mutex;
-
        /* held while inesrting or deleting extents from files */
        struct mutex extent_mutex;
 
@@ -79,6 +71,9 @@ struct btrfs_inode {
         */
        u64 generation;
 
+       /* sequence number for NFS changes */
+       u64 sequence;
+
        /*
         * transid of the trans_handle that last modified this inode
         */
@@ -115,6 +110,9 @@ struct btrfs_inode {
         */
        u64 index_cnt;
 
+       /* the start of block group preferred for allocations. */
+       u64 block_group;
+
        struct inode vfs_inode;
 };