diff options
Diffstat (limited to 'fs/btrfs')
-rw-r--r-- | fs/btrfs/delayed-inode.c | 2 | ||||
-rw-r--r-- | fs/btrfs/transaction.c | 6 | ||||
-rw-r--r-- | fs/btrfs/transaction.h | 2 |
3 files changed, 1 insertions, 9 deletions
diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c index 6b2013403f46..826a26053c70 100644 --- a/fs/btrfs/delayed-inode.c +++ b/fs/btrfs/delayed-inode.c | |||
@@ -1302,7 +1302,7 @@ again: | |||
1302 | __btrfs_commit_inode_delayed_items(trans, path, delayed_node); | 1302 | __btrfs_commit_inode_delayed_items(trans, path, delayed_node); |
1303 | 1303 | ||
1304 | trans->block_rsv = block_rsv; | 1304 | trans->block_rsv = block_rsv; |
1305 | btrfs_end_transaction_dmeta(trans, root); | 1305 | btrfs_end_transaction(trans, root); |
1306 | btrfs_btree_balance_dirty_nodelay(root); | 1306 | btrfs_btree_balance_dirty_nodelay(root); |
1307 | 1307 | ||
1308 | release_path: | 1308 | release_path: |
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c index 46bfd820d91f..e5fe801659ba 100644 --- a/fs/btrfs/transaction.c +++ b/fs/btrfs/transaction.c | |||
@@ -790,12 +790,6 @@ int btrfs_end_transaction_throttle(struct btrfs_trans_handle *trans, | |||
790 | return __btrfs_end_transaction(trans, root, 1); | 790 | return __btrfs_end_transaction(trans, root, 1); |
791 | } | 791 | } |
792 | 792 | ||
793 | int btrfs_end_transaction_dmeta(struct btrfs_trans_handle *trans, | ||
794 | struct btrfs_root *root) | ||
795 | { | ||
796 | return __btrfs_end_transaction(trans, root, 1); | ||
797 | } | ||
798 | |||
799 | /* | 793 | /* |
800 | * when btree blocks are allocated, they have some corresponding bits set for | 794 | * when btree blocks are allocated, they have some corresponding bits set for |
801 | * them in one of two extent_io trees. This is used to make sure all of | 795 | * them in one of two extent_io trees. This is used to make sure all of |
diff --git a/fs/btrfs/transaction.h b/fs/btrfs/transaction.h index 7657d115067d..d05b6013fea8 100644 --- a/fs/btrfs/transaction.h +++ b/fs/btrfs/transaction.h | |||
@@ -154,8 +154,6 @@ int btrfs_commit_transaction_async(struct btrfs_trans_handle *trans, | |||
154 | int wait_for_unblock); | 154 | int wait_for_unblock); |
155 | int btrfs_end_transaction_throttle(struct btrfs_trans_handle *trans, | 155 | int btrfs_end_transaction_throttle(struct btrfs_trans_handle *trans, |
156 | struct btrfs_root *root); | 156 | struct btrfs_root *root); |
157 | int btrfs_end_transaction_dmeta(struct btrfs_trans_handle *trans, | ||
158 | struct btrfs_root *root); | ||
159 | int btrfs_should_end_transaction(struct btrfs_trans_handle *trans, | 157 | int btrfs_should_end_transaction(struct btrfs_trans_handle *trans, |
160 | struct btrfs_root *root); | 158 | struct btrfs_root *root); |
161 | void btrfs_throttle(struct btrfs_root *root); | 159 | void btrfs_throttle(struct btrfs_root *root); |