summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorJosef Bacik <jbacik@fusionio.com>2013-07-31 10:28:05 -0400
committerChris Mason <chris.mason@fusionio.com>2013-09-01 08:04:42 -0400
commit6596a9281995a3c7dee8ca6666bd169fffc928e1 (patch)
tree34f5d454495109f88703b40230efed38ad732384 /fs
parentb6c60c8018c4e9beb2f83fc82c09f9d033766571 (diff)
downloadlinux-6596a9281995a3c7dee8ca6666bd169fffc928e1.tar.bz2
Btrfs: don't bug_on when we fail when cleaning up transactions
There is no reason for this sort of jackassery. Thanks, Signed-off-by: Josef Bacik <jbacik@fusionio.com> Signed-off-by: Chris Mason <chris.mason@fusionio.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/btrfs/transaction.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
index 18f7e71d1593..ea8d52212d75 100644
--- a/fs/btrfs/transaction.c
+++ b/fs/btrfs/transaction.c
@@ -1942,6 +1942,5 @@ int btrfs_clean_one_deleted_snapshot(struct btrfs_root *root)
* If we encounter a transaction abort during snapshot cleaning, we
* don't want to crash here
*/
- BUG_ON(ret < 0 && ret != -EAGAIN && ret != -EROFS);
- return 1;
+ return (ret < 0) ? 0 : 1;
}