Commit c5b4a50b authored by Filipe Manana's avatar Filipe Manana Committed by David Sterba
Browse files

Btrfs: fix return value on rename exchange failure

If we failed during a rename exchange operation after starting/joining a
transaction, we would end up replacing the return value, stored in the
local 'ret' variable, with the return value from btrfs_end_transaction().
So this could end up returning 0 (success) to user space despite the
operation having failed and aborted the transaction, because if there are
multiple tasks having a reference on the transaction at the time
btrfs_end_transaction() is called by the rename exchange, that function
returns 0 (otherwise it returns -EIO and not the original error value).
So fix this by not overwriting the return value on error after getting
a transaction handle.

Fixes: cdd1fedf

 ("btrfs: add support for RENAME_EXCHANGE and RENAME_WHITEOUT")
CC: # 4.9+
Signed-off-by: default avatarFilipe Manana <>
Reviewed-by: default avatarDavid Sterba <>
Signed-off-by: default avatarDavid Sterba <>
parent 22883ddc
......@@ -9443,6 +9443,7 @@ static int btrfs_rename_exchange(struct inode *old_dir,
u64 new_idx = 0;
u64 root_objectid;
int ret;
int ret2;
bool root_log_pinned = false;
bool dest_log_pinned = false;
......@@ -9639,7 +9640,8 @@ static int btrfs_rename_exchange(struct inode *old_dir,
dest_log_pinned = false;
ret = btrfs_end_transaction(trans);
ret2 = btrfs_end_transaction(trans);
ret = ret ? ret : ret2;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment