diff options
| author | Miao Xie <miaox@cn.fujitsu.com> | 2012-11-01 11:32:18 +0400 |
|---|---|---|
| committer | Josef Bacik <jbacik@fusionio.com> | 2012-12-13 02:15:20 +0400 |
| commit | b7d5b0a819498a9c04e1d18201a42468f7edd92a (patch) | |
| tree | ac708a897951993954b0e52b33641c4ee19bfa2c /fs/btrfs/transaction.c | |
| parent | 4fde183d8c755f8a8bdffcb03a8d947e62ccea6a (diff) | |
| download | linux-b7d5b0a819498a9c04e1d18201a42468f7edd92a.tar.xz | |
Btrfs: fix joining the same transaction handler more than 2 times
If we flush inodes with pending delalloc in a transaction, we may join
the same transaction handler more than 2 times.
The reason is:
Task use_count of trans handle
commit_transaction 1
|-> btrfs_start_delalloc_inodes 1
|-> run_delalloc_nocow 1
|-> join_transaction 2
|-> cow_file_range 2
|-> join_transaction 3
In fact, cow_file_range needn't join the transaction again because the caller
have joined the transaction, so we fix this problem by this way.
Reported-by: Liu Bo <bo.li.liu@oracle.com>
Signed-off-by: Miao Xie <miaox@cn.fujitsu.com>
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
Diffstat (limited to 'fs/btrfs/transaction.c')
| -rw-r--r-- | fs/btrfs/transaction.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c index 259f74eabdb8..44a5d73fddbe 100644 --- a/fs/btrfs/transaction.c +++ b/fs/btrfs/transaction.c @@ -312,6 +312,7 @@ start_transaction(struct btrfs_root *root, u64 num_items, int type, WARN_ON(type != TRANS_JOIN && type != TRANS_JOIN_NOLOCK); h = current->journal_info; h->use_count++; + WARN_ON(h->use_count > 2); h->orig_rsv = h->block_rsv; h->block_rsv = NULL; goto got_it; |