Merge branch 'qgroup' of git://git.jan-o-sch.net/btrfs-unstable into for-linus

[~andy/linux] / fs / btrfs / transaction.h

diff --git a/fs/btrfs/transaction.h b/fs/btrfs/transaction.h
index 16ba00842c3852c7a1a9c3fb4f88270cb4d7c5fa..e8b8416c688b2a7b5d6c4f79c844bb07953cb3b5 100644 (file)
--- a/fs/btrfs/transaction.h
+++ b/fs/btrfs/transaction.h
@@ -50,6 +50,7 @@ struct btrfs_transaction {
 struct btrfs_trans_handle {
        u64 transid;
        u64 bytes_reserved;
+       u64 qgroup_reserved;
        unsigned long use_count;
        unsigned long blocks_reserved;
        unsigned long blocks_used;
@@ -58,6 +59,7 @@ struct btrfs_trans_handle {
        struct btrfs_block_rsv *block_rsv;
        struct btrfs_block_rsv *orig_rsv;
        int aborted;
+       int adding_csums;
        /*
         * this root is only needed to validate that the root passed to
         * start_transaction is the same as the one passed to end_transaction.
@@ -72,6 +74,7 @@ struct btrfs_pending_snapshot {
        struct dentry *dentry;
        struct btrfs_root *root;
        struct btrfs_root *snap;
+       struct btrfs_qgroup_inherit *inherit;
        /* block reservation for the operation */
        struct btrfs_block_rsv block_rsv;
        /* extra metadata reseration for relocation */