Merge branch 'md-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/song/md...

[linux-2.6-microblaze.git] / fs / btrfs / transaction.h

diff --git a/fs/btrfs/transaction.h b/fs/btrfs/transaction.h
index 364cfbb..07d7602 100644 (file)
--- a/fs/btrfs/transaction.h
+++ b/fs/btrfs/transaction.h
@@ -122,8 +122,6 @@ struct btrfs_transaction {
 
 #define TRANS_EXTWRITERS       (__TRANS_START | __TRANS_ATTACH)
 
-#define BTRFS_SEND_TRANS_STUB  ((void *)1)
-
 struct btrfs_trans_handle {
        u64 transid;
        u64 bytes_reserved;
@@ -143,7 +141,6 @@ struct btrfs_trans_handle {
        bool allocating_chunk;
        bool can_flush_pending_bgs;
        bool reloc_reserved;
-       bool dirty;
        bool in_fsync;
        struct btrfs_root *root;
        struct btrfs_fs_info *fs_info;
@@ -227,8 +224,7 @@ void btrfs_add_dead_root(struct btrfs_root *root);
 int btrfs_defrag_root(struct btrfs_root *root);
 int btrfs_clean_one_deleted_snapshot(struct btrfs_root *root);
 int btrfs_commit_transaction(struct btrfs_trans_handle *trans);
-int btrfs_commit_transaction_async(struct btrfs_trans_handle *trans,
-                                  int wait_for_unblock);
+int btrfs_commit_transaction_async(struct btrfs_trans_handle *trans);
 int btrfs_end_transaction_throttle(struct btrfs_trans_handle *trans);
 bool btrfs_should_end_transaction(struct btrfs_trans_handle *trans);
 void btrfs_throttle(struct btrfs_fs_info *fs_info);