Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipe Manana <fdmanana@suse.com>2015-08-19 15:12:33 +0100
committerFilipe Manana <fdmanana@suse.com>2015-08-19 15:12:37 +0100
commit11d20e0e873833ea082b342815da7f1890bbe408 (patch)
tree254754e45ede27c3c41b6679e3f5e63e78ed8709
parent8e9f599adacfd05f0228626aa3af44bbfc5bde5e (diff)
Btrfs: check if previous transaction aborted to avoid fsrpm-3.0.101-0.47.67
-rw-r--r--fs/btrfs/transaction.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
index 17c0742b8656..560ddde55f26 100644
--- a/fs/btrfs/transaction.c
+++ b/fs/btrfs/transaction.c
@@ -1716,8 +1716,11 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans,
spin_unlock(&root->fs_info->trans_lock);
wait_for_commit(root, prev_trans);
+ ret = prev_trans->aborted;
put_transaction(prev_trans);
+ if (ret)
+ goto cleanup_transaction;
} else {
spin_unlock(&root->fs_info->trans_lock);
}