]> git.baikalelectronics.ru Git - kernel.git/commit
btrfs: account for non-CoW'd blocks in btrfs_abort_transaction
authorJeff Mahoney <jeffm@suse.com>
Wed, 8 Jun 2016 04:36:38 +0000 (00:36 -0400)
committerDavid Sterba <dsterba@suse.com>
Fri, 17 Jun 2016 16:32:40 +0000 (18:32 +0200)
commit9a278a9e6e80c61b25a161462ada5e1345545cae
tree731fb378fc65fa1f3c767075979801ea07b71dd6
parent6ed57f04b8b296ea16d28321d054ad64f0dabded
btrfs: account for non-CoW'd blocks in btrfs_abort_transaction

The test for !trans->blocks_used in btrfs_abort_transaction is
insufficient to determine whether it's safe to drop the transaction
handle on the floor.  btrfs_cow_block, informed by should_cow_block,
can return blocks that have already been CoW'd in the current
transaction.  trans->blocks_used is only incremented for new block
allocations. If an operation overlaps the blocks in the current
transaction entirely and must abort the transaction, we'll happily
let it clean up the trans handle even though it may have modified
the blocks and will commit an incomplete operation.

In the long-term, I'd like to do closer tracking of when the fs
is actually modified so we can still recover as gracefully as possible,
but that approach will need some discussion.  In the short term,
since this is the only code using trans->blocks_used, let's just
switch it to a bool indicating whether any blocks were used and set
it when should_cow_block returns false.

Cc: stable@vger.kernel.org # 3.4+
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Reviewed-by: Filipe Manana <fdmanana@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/ctree.c
fs/btrfs/extent-tree.c
fs/btrfs/super.c
fs/btrfs/transaction.h