|
@@ -1575,6 +1575,11 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans,
|
|
wait_event(cur_trans->writer_wait,
|
|
wait_event(cur_trans->writer_wait,
|
|
atomic_read(&cur_trans->num_writers) == 1);
|
|
atomic_read(&cur_trans->num_writers) == 1);
|
|
|
|
|
|
|
|
+ /* ->aborted might be set after the previous check, so check it */
|
|
|
|
+ if (unlikely(ACCESS_ONCE(cur_trans->aborted))) {
|
|
|
|
+ ret = cur_trans->aborted;
|
|
|
|
+ goto cleanup_transaction;
|
|
|
|
+ }
|
|
/*
|
|
/*
|
|
* the reloc mutex makes sure that we stop
|
|
* the reloc mutex makes sure that we stop
|
|
* the balancing code from coming in and moving
|
|
* the balancing code from coming in and moving
|
|
@@ -1658,6 +1663,17 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans,
|
|
goto cleanup_transaction;
|
|
goto cleanup_transaction;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ /*
|
|
|
|
+ * The tasks which save the space cache and inode cache may also
|
|
|
|
+ * update ->aborted, check it.
|
|
|
|
+ */
|
|
|
|
+ if (unlikely(ACCESS_ONCE(cur_trans->aborted))) {
|
|
|
|
+ ret = cur_trans->aborted;
|
|
|
|
+ mutex_unlock(&root->fs_info->tree_log_mutex);
|
|
|
|
+ mutex_unlock(&root->fs_info->reloc_mutex);
|
|
|
|
+ goto cleanup_transaction;
|
|
|
|
+ }
|
|
|
|
+
|
|
btrfs_prepare_extent_commit(trans, root);
|
|
btrfs_prepare_extent_commit(trans, root);
|
|
|
|
|
|
cur_trans = root->fs_info->running_transaction;
|
|
cur_trans = root->fs_info->running_transaction;
|