summaryrefslogtreecommitdiffstats
path: root/fs/btrfs/transaction.c
diff options
context:
space:
mode:
authorDavid Sterba <dsterba@suse.cz>2013-03-12 10:46:08 -0400
committerJosef Bacik <jbacik@fusionio.com>2013-05-06 15:52:56 -0400
commit087488109afb4cc1bbdd3557779129c34045609a (patch)
tree7e5ef3a85226ac66261cbe2642c71151bb8f61b3 /fs/btrfs/transaction.c
parentbbece8a3f00a02bbfc63531651fd70ef56c5e916 (diff)
btrfs: clean up transaction abort messages
The transaction abort stacktrace is printed only once per module lifetime, but we'd like to see it each time it happens per mounted filesystem. Introduce a fs_state flag that records it. Tweak the messages around abort: * add error number to the first abort * print the exact negative errno from btrfs_decode_error * clean up btrfs_decode_error and callers * no dots at the end of the messages Signed-off-by: David Sterba <dsterba@suse.cz> Signed-off-by: Josef Bacik <jbacik@fusionio.com>
Diffstat (limited to 'fs/btrfs/transaction.c')
-rw-r--r--fs/btrfs/transaction.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
index 50767bbaad6c..6c0a72ab6de0 100644
--- a/fs/btrfs/transaction.c
+++ b/fs/btrfs/transaction.c
@@ -1808,7 +1808,7 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans,
1808 ret = btrfs_write_and_wait_transaction(trans, root); 1808 ret = btrfs_write_and_wait_transaction(trans, root);
1809 if (ret) { 1809 if (ret) {
1810 btrfs_error(root->fs_info, ret, 1810 btrfs_error(root->fs_info, ret,
1811 "Error while writing out transaction."); 1811 "Error while writing out transaction");
1812 mutex_unlock(&root->fs_info->tree_log_mutex); 1812 mutex_unlock(&root->fs_info->tree_log_mutex);
1813 goto cleanup_transaction; 1813 goto cleanup_transaction;
1814 } 1814 }
@@ -1864,8 +1864,7 @@ cleanup_transaction:
1864 btrfs_qgroup_free(root, trans->qgroup_reserved); 1864 btrfs_qgroup_free(root, trans->qgroup_reserved);
1865 trans->qgroup_reserved = 0; 1865 trans->qgroup_reserved = 0;
1866 } 1866 }
1867 btrfs_printk(root->fs_info, "Skipping commit of aborted transaction.\n"); 1867 btrfs_printk(root->fs_info, "Skipping commit of aborted transaction\n");
1868// WARN_ON(1);
1869 if (current->journal_info == trans) 1868 if (current->journal_info == trans)
1870 current->journal_info = NULL; 1869 current->journal_info = NULL;
1871 cleanup_transaction(trans, root, ret); 1870 cleanup_transaction(trans, root, ret);