Merge tag 'v3.13-rc3' into for-linus

[firefly-linux-kernel-4.4.55.git] / fs / btrfs / transaction.h

diff --git a/fs/btrfs/transaction.h b/fs/btrfs/transaction.h
index 5c2af8491621ced0d1b35110210143a09a1aa418..7657d115067d3f8ae1d5cc39a53410d8a1011673 100644 (file)
--- a/fs/btrfs/transaction.h
+++ b/fs/btrfs/transaction.h
@@ -92,6 +92,7 @@ struct btrfs_trans_handle {
        short aborted;
        short adding_csums;
        bool allocating_chunk;
+       bool reloc_reserved;
        unsigned int type;
        /*
         * this root is only needed to validate that the root passed to
@@ -166,4 +167,5 @@ int btrfs_wait_marked_extents(struct btrfs_root *root,
                                struct extent_io_tree *dirty_pages, int mark);
 int btrfs_transaction_blocked(struct btrfs_fs_info *info);
 int btrfs_transaction_in_commit(struct btrfs_fs_info *info);
+void btrfs_put_transaction(struct btrfs_transaction *transaction);
 #endif