]> git.baikalelectronics.ru Git - kernel.git/commitdiff
Btrfs: don't bug_on when we fail when cleaning up transactions
authorJosef Bacik <jbacik@fusionio.com>
Wed, 31 Jul 2013 14:28:05 +0000 (10:28 -0400)
committerChris Mason <chris.mason@fusionio.com>
Sun, 1 Sep 2013 12:04:42 +0000 (08:04 -0400)
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>
fs/btrfs/transaction.c

index 18f7e71d159329000d3e98409c78de58dddb8336..ea8d52212d75470f08f74d068f33486226f18590 100644 (file)
@@ -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;
 }