diff options
| author | Josef Bacik <jbacik@fusionio.com> | 2013-09-27 16:32:39 -0400 |
|---|---|---|
| committer | Chris Mason <chris.mason@fusionio.com> | 2013-11-11 21:53:42 -0500 |
| commit | 4e121c06adf53aae478ebce3035116595d063413 (patch) | |
| tree | debfa36ad00bef15ca1d052e98a315eda665c2ee /fs/btrfs/disk-io.c | |
| parent | b6d08f0630d51ec09d67f16f6d7839699bbc0402 (diff) | |
| download | linux-4e121c06adf53aae478ebce3035116595d063413.tar.gz | |
Btrfs: cleanup transaction on abort
If we abort not during a transaction commit we won't clean up anything until we unmount. Unfortunately if we abort in the middle of writing out an ordered extent we won't clean it up and if somebody is waiting on that ordered extent they will wait forever. To fix this just make the transaction kthread call the cleanup transaction stuff if it notices theres an error, and make btrfs_end_transaction wake up the transaction kthread if there is an error. Thanks, Signed-off-by: Josef Bacik <jbacik@fusionio.com> Signed-off-by: Chris Mason <chris.mason@fusionio.com>
Diffstat (limited to 'fs/btrfs/disk-io.c')
| -rw-r--r-- | fs/btrfs/disk-io.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index db2095486a4f..113cd43530ba 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -1800,6 +1800,9 @@ sleep: wake_up_process(root->fs_info->cleaner_kthread); mutex_unlock(&root->fs_info->transaction_kthread_mutex); + if (unlikely(test_bit(BTRFS_FS_STATE_ERROR, + &root->fs_info->fs_state))) + btrfs_cleanup_transaction(root); if (!try_to_freeze()) { set_current_state(TASK_INTERRUPTIBLE); if (!kthread_should_stop() && |