Btrfs: do not abort transaction at btrfs_update_root() after failure to COW path
PATCH 1/1 Btrfs: do not abort transaction at btrfs_update_root() after failure to COW path
From: Filipe Manana <[email protected]>
Currently when we fail to COW a path at btrfs_update_root() we end up always aborting the transaction. However all the current callers of btrfs_update_root() are able to deal with errors returned from it, many do end up aborting the transaction themselves (directly or not, such as the transaction commit path), other BUG_ON() or just gracefully cancel whatever they were doing.
When syncing the fsync log, we call btrfs_update_root() through tree-log.c:update_log_root(), and if it returns an -ENOSPC error, the log sync code does not abort the transaction, instead it gracefully handles the error and returns -EAGAIN to the fsync handler, so that it falls back to a transaction commit. Any other error different from -ENOSPC, makes the log sync code abort the transaction.
So remove the transaction abort from btrfs_update_log() when we fail to COW a path to update the root item, so that if an -ENOSPC failure happens we avoid aborting the current transaction and have a chance of the fsync succeeding after falling back to a transaction commit.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=203413
--- fs/btrfs/root-tree.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
fs/btrfs/root-tree.c +1 -3
@@ -132,10 +132,8 @@ int btrfs_update_root(struct btrfs_trans_handle *trans, struct btrfs_rootreturn -ENOMEM ; ret =btrfs_search_slot (trans, root, key, path,0 ,1 ); -if (ret <0 ) { -btrfs_abort_transaction (trans, ret); +if (ret <0 ) goto out; - }if (ret !=0 ) {btrfs_print_leaf (path->nodes[0 ]);
Signature · 1 line
2.11.0
Quoted 16 lines · On 29/4/19 8:08 PM, [email protected] wrote:
From: Filipe Manana <[email protected]>
Currently when we fail to COW a path at
btrfs_update_root()we end up always aborting the transaction. However all the current callers ofbtrfs_update_root()are able to deal with errors returned from it, many do end up aborting the transaction themselves (directly or not, such as the transaction commit path), otherBUG_ON()or just gracefully cancel whatever they were doing.When syncing the fsync log, we call
btrfs_update_root()through tree-log.c:update_log_root(), and if it returns an-ENOSPCerror, the log sync code does not abort the transaction, instead it gracefully handles the error and returns-EAGAINto the fsync handler, so that it falls back to a transaction commit. Any other error different from-ENOSPC, makes the log sync code abort the transaction.
Quoted 8 lines
So remove the transaction abort from
btrfs_update_log()when we fail to COW a path to update the root item, so that if an-ENOSPCfailure happens we avoid aborting the current transaction and have a chance of the fsync succeeding after falling back to a transaction commit.Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=203413
Fixes 79787eaab46121 ("btrfs: replace many BUG_ONs with proper error handling")Signed-off-by Filipe Manana <[email protected]>
Quoted 21 lines
--- fs/btrfs/root-tree.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)fs/btrfs/root-tree.c +1
-3@@ -132,10 +132,8 @@ int btrfs_update_root(struct btrfs_trans_handle *trans, struct btrfs_rootreturn -ENOMEM ; ret =btrfs_search_slot (trans, root, key, path,0 ,1 ); -if (ret <0 ) { -btrfs_abort_transaction (trans, ret); +if (ret <0 ) goto out; - }if (ret !=0 ) {btrfs_print_leaf (path->nodes[0 ]);
Quoted 16 lines · On Mon, Apr 29, 2019 at 01:08:14PM +0100, [email protected] wrote:
From: Filipe Manana <[email protected]>
Currently when we fail to COW a path at
btrfs_update_root()we end up always aborting the transaction. However all the current callers ofbtrfs_update_root()are able to deal with errors returned from it, many do end up aborting the transaction themselves (directly or not, such as the transaction commit path), otherBUG_ON()or just gracefully cancel whatever they were doing.When syncing the fsync log, we call
btrfs_update_root()through tree-log.c:update_log_root(), and if it returns an-ENOSPCerror, the log sync code does not abort the transaction, instead it gracefully handles the error and returns-EAGAINto the fsync handler, so that it falls back to a transaction commit. Any other error different from-ENOSPC, makes the log sync code abort the transaction.
Quoted 8 lines
So remove the transaction abort from
btrfs_update_log()when we fail to COW a path to update the root item, so that if an-ENOSPCfailure happens we avoid aborting the current transaction and have a chance of the fsync succeeding after falling back to a transaction commit.Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=203413
Fixes 79787eaab46121 ("btrfs: replace many BUG_ONs with proper error handling")Signed-off-by Filipe Manana <[email protected]>
Added to misc-next, thanks.